Skip to content

Commit 1b36a68

Browse files
Victoria LeaseAndroid (Google) Code Review
authored andcommitted
Merge "DO NOT MERGE Engineer-asset light-theme findonpage prev/next buttons" into jb-dev
2 parents ebc9d31 + 45f5a76 commit 1b36a68

9 files changed

Lines changed: 16 additions & 2 deletions

File tree

926 Bytes
Loading
920 Bytes
Loading
623 Bytes
Loading
622 Bytes
Loading
1.32 KB
Loading
1.29 KB
Loading

core/res/res/menu/webview_find.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
<menu xmlns:android="http://schemas.android.com/apk/res/android">
1818
<item android:id="@+id/find_prev"
19-
android:icon="@drawable/ic_find_previous_holo_dark"
19+
android:icon="?android:attr/findOnPagePreviousDrawable"
2020
android:showAsAction="always"
2121
/>
2222
<item android:id="@+id/find_next"
23-
android:icon="@drawable/ic_find_next_holo_dark"
23+
android:icon="?android:attr/findOnPageNextDrawable"
2424
android:showAsAction="always"
2525
/>
2626
</menu>

core/res/res/values/attrs.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -842,6 +842,12 @@
842842
<!-- The drawable for accessibility focused views. -->
843843
<attr name="accessibilityFocusedDrawable" format="reference" />
844844

845+
<!-- Drawable for WebView find-on-page dialogue's "next" button. @hide -->
846+
<attr name="findOnPageNextDrawable" format="reference" />
847+
848+
<!-- Drawable for WebView find-on-page dialogue's "previous" button. @hide -->
849+
<attr name="findOnPagePreviousDrawable" format="reference" />
850+
845851
</declare-styleable>
846852

847853
<!-- **************************************************************** -->

core/res/res/values/themes.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@ please see themes_device_defaults.xml.
153153
?android:attr/expandableListPreferredItemIndicatorLeft</item>
154154
<item name="expandableListPreferredChildIndicatorRight">
155155
?android:attr/expandableListPreferredItemIndicatorRight</item>
156+
<item name="findOnPageNextDrawable">@android:drawable/ic_find_next_holo_dark</item>
157+
<item name="findOnPagePreviousDrawable">@android:drawable/ic_find_previous_holo_dark</item>
156158

157159
<!-- Gallery attributes -->
158160
<item name="galleryItemBackground">@android:drawable/gallery_item_background</item>
@@ -467,6 +469,8 @@ please see themes_device_defaults.xml.
467469
<item name="detailsElementBackground">@android:drawable/panel_bg_holo_light</item>
468470

469471
<item name="mediaRouteButtonStyle">@android:style/Widget.DeviceDefault.Light.MediaRouteButton</item>
472+
<item name="findOnPageNextDrawable">@android:drawable/ic_find_next_holo_light</item>
473+
<item name="findOnPagePreviousDrawable">@android:drawable/ic_find_previous_holo_light</item>
470474
</style>
471475

472476
<!-- Variant of {@link #Theme_Light} with no title bar -->
@@ -980,6 +984,8 @@ please see themes_device_defaults.xml.
980984
<item name="expandableListPreferredItemIndicatorRight">0dip</item>
981985
<item name="expandableListPreferredChildIndicatorLeft">?android:attr/expandableListPreferredItemIndicatorLeft</item>
982986
<item name="expandableListPreferredChildIndicatorRight">?android:attr/expandableListPreferredItemIndicatorRight</item>
987+
<item name="findOnPageNextDrawable">@android:drawable/ic_find_next_holo_dark</item>
988+
<item name="findOnPagePreviousDrawable">@android:drawable/ic_find_previous_holo_dark</item>
983989

984990
<!-- Gallery attributes -->
985991
<item name="galleryItemBackground">@android:drawable/gallery_item_background</item>
@@ -1283,6 +1289,8 @@ please see themes_device_defaults.xml.
12831289
<item name="expandableListPreferredChildIndicatorRight">?android:attr/expandableListPreferredItemIndicatorRight</item>
12841290

12851291
<item name="listDividerAlertDialog">@android:drawable/list_divider_holo_light</item>
1292+
<item name="findOnPageNextDrawable">@android:drawable/ic_find_next_holo_light</item>
1293+
<item name="findOnPagePreviousDrawable">@android:drawable/ic_find_previous_holo_light</item>
12861294

12871295
<!-- Gallery attributes -->
12881296
<item name="galleryItemBackground">@android:drawable/gallery_item_background</item>

0 commit comments

Comments
 (0)