Merge "Switch the default text selection handles to Material style." into nyc-dev
am: 78e421dbce
* commit '78e421dbced3181d0f43a174683b3c34cbb88a70':
Switch the default text selection handles to Material style.
Change-Id: I07212a44d71c060eae1ed0a9afde451cb2d83713
diff --git a/core/res/res/drawable-hdpi/text_select_handle_left.png b/core/res/res/drawable-hdpi/text_select_handle_left.png
deleted file mode 100644
index d2ed06d..0000000
--- a/core/res/res/drawable-hdpi/text_select_handle_left.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-hdpi/text_select_handle_middle.png b/core/res/res/drawable-hdpi/text_select_handle_middle.png
deleted file mode 100644
index be2dc68..0000000
--- a/core/res/res/drawable-hdpi/text_select_handle_middle.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-hdpi/text_select_handle_right.png b/core/res/res/drawable-hdpi/text_select_handle_right.png
deleted file mode 100644
index e419249..0000000
--- a/core/res/res/drawable-hdpi/text_select_handle_right.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-ldpi/text_select_handle_left.png b/core/res/res/drawable-ldpi/text_select_handle_left.png
deleted file mode 100644
index bded42c..0000000
--- a/core/res/res/drawable-ldpi/text_select_handle_left.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-ldpi/text_select_handle_middle.png b/core/res/res/drawable-ldpi/text_select_handle_middle.png
deleted file mode 100644
index c1d8d17..0000000
--- a/core/res/res/drawable-ldpi/text_select_handle_middle.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-ldpi/text_select_handle_right.png b/core/res/res/drawable-ldpi/text_select_handle_right.png
deleted file mode 100644
index aae0b40..0000000
--- a/core/res/res/drawable-ldpi/text_select_handle_right.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-mdpi/text_select_handle_left.png b/core/res/res/drawable-mdpi/text_select_handle_left.png
deleted file mode 100644
index 750cdea..0000000
--- a/core/res/res/drawable-mdpi/text_select_handle_left.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-mdpi/text_select_handle_middle.png b/core/res/res/drawable-mdpi/text_select_handle_middle.png
deleted file mode 100644
index 3cdca90..0000000
--- a/core/res/res/drawable-mdpi/text_select_handle_middle.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-mdpi/text_select_handle_right.png b/core/res/res/drawable-mdpi/text_select_handle_right.png
deleted file mode 100644
index fc3d144..0000000
--- a/core/res/res/drawable-mdpi/text_select_handle_right.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/text_select_handle_left.png b/core/res/res/drawable-xhdpi/text_select_handle_left.png
deleted file mode 100644
index 98d10c9..0000000
--- a/core/res/res/drawable-xhdpi/text_select_handle_left.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/text_select_handle_middle.png b/core/res/res/drawable-xhdpi/text_select_handle_middle.png
deleted file mode 100644
index 058b30b..0000000
--- a/core/res/res/drawable-xhdpi/text_select_handle_middle.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/text_select_handle_right.png b/core/res/res/drawable-xhdpi/text_select_handle_right.png
deleted file mode 100644
index b3a0c9f..0000000
--- a/core/res/res/drawable-xhdpi/text_select_handle_right.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/text_select_handle_left.png b/core/res/res/drawable-xxhdpi/text_select_handle_left.png
deleted file mode 100644
index 8497601..0000000
--- a/core/res/res/drawable-xxhdpi/text_select_handle_left.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/text_select_handle_middle.png b/core/res/res/drawable-xxhdpi/text_select_handle_middle.png
deleted file mode 100644
index 7b74f66..0000000
--- a/core/res/res/drawable-xxhdpi/text_select_handle_middle.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/text_select_handle_right.png b/core/res/res/drawable-xxhdpi/text_select_handle_right.png
deleted file mode 100644
index 25e0780..0000000
--- a/core/res/res/drawable-xxhdpi/text_select_handle_right.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml
index c083a5e..30e23f5 100644
--- a/core/res/res/values/arrays.xml
+++ b/core/res/res/values/arrays.xml
@@ -81,8 +81,6 @@
<item>@drawable/edit_text_holo_dark</item>
<item>@drawable/text_cursor_holo_light</item>
<item>@drawable/text_cursor_holo_dark</item>
- <item>@drawable/text_select_handle_left</item>
- <item>@drawable/text_select_handle_right</item>
<item>@drawable/text_edit_paste_window</item>
<item>@drawable/expander_close_holo_dark</item>
<item>@drawable/expander_close_holo_light</item>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 29818df..7ed293f 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1232,9 +1232,6 @@
<java-symbol type="drawable" name="tab_bottom_right" />
<java-symbol type="drawable" name="tab_bottom_right_v4" />
<java-symbol type="drawable" name="tab_indicator_v4" />
- <java-symbol type="drawable" name="text_select_handle_left" />
- <java-symbol type="drawable" name="text_select_handle_middle" />
- <java-symbol type="drawable" name="text_select_handle_right" />
<java-symbol type="drawable" name="unknown_image" />
<java-symbol type="drawable" name="unlock_default" />
<java-symbol type="drawable" name="unlock_halo" />
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index bf7718e..998eea5 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -248,9 +248,9 @@
<item name="scrollbarTrackVertical">@null</item>
<!-- Text selection handle attributes -->
- <item name="textSelectHandleLeft">@drawable/text_select_handle_left</item>
- <item name="textSelectHandleRight">@drawable/text_select_handle_right</item>
- <item name="textSelectHandle">@drawable/text_select_handle_middle</item>
+ <item name="textSelectHandleLeft">@drawable/text_select_handle_left_material</item>
+ <item name="textSelectHandleRight">@drawable/text_select_handle_right_material</item>
+ <item name="textSelectHandle">@drawable/text_select_handle_middle_material</item>
<item name="textSelectHandleWindowStyle">@style/Widget.TextSelectHandle</item>
<item name="textEditPasteWindowLayout">@layout/text_edit_paste_window</item>
<item name="textEditNoPasteWindowLayout">@layout/text_edit_no_paste_window</item>
diff --git a/core/res/res/values/themes_holo.xml b/core/res/res/values/themes_holo.xml
index 677051a..8f73479 100644
--- a/core/res/res/values/themes_holo.xml
+++ b/core/res/res/values/themes_holo.xml
@@ -247,9 +247,9 @@
<item name="scrollbarTrackVertical">@null</item>
<!-- Text selection handle attributes -->
- <item name="textSelectHandleLeft">@drawable/text_select_handle_left</item>
- <item name="textSelectHandleRight">@drawable/text_select_handle_right</item>
- <item name="textSelectHandle">@drawable/text_select_handle_middle</item>
+ <item name="textSelectHandleLeft">@drawable/text_select_handle_left_material</item>
+ <item name="textSelectHandleRight">@drawable/text_select_handle_right_material</item>
+ <item name="textSelectHandle">@drawable/text_select_handle_middle_material</item>
<item name="textSelectHandleWindowStyle">@style/Widget.Holo.TextSelectHandle</item>
<item name="textCursorDrawable">@drawable/text_cursor_holo_dark</item>
@@ -588,9 +588,9 @@
<item name="scrollbarTrackVertical">@null</item>
<!-- Text selection handle attributes -->
- <item name="textSelectHandleLeft">@drawable/text_select_handle_left</item>
- <item name="textSelectHandleRight">@drawable/text_select_handle_right</item>
- <item name="textSelectHandle">@drawable/text_select_handle_middle</item>
+ <item name="textSelectHandleLeft">@drawable/text_select_handle_left_material</item>
+ <item name="textSelectHandleRight">@drawable/text_select_handle_right_material</item>
+ <item name="textSelectHandle">@drawable/text_select_handle_middle_material</item>
<item name="textSelectHandleWindowStyle">@style/Widget.Holo.TextSelectHandle</item>
<item name="textCursorDrawable">@drawable/text_cursor_holo_light</item>
diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/AssetsAtlasActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/AssetsAtlasActivity.java
index df7e3bb..cbf99dc 100644
--- a/tests/HwAccelerationTest/src/com/android/test/hwui/AssetsAtlasActivity.java
+++ b/tests/HwAccelerationTest/src/com/android/test/hwui/AssetsAtlasActivity.java
@@ -42,7 +42,7 @@
BitmapsView(Context c) {
super(c);
- Drawable d = c.getResources().getDrawable(R.drawable.text_select_handle_left);
+ Drawable d = c.getResources().getDrawable(R.drawable.star_big_on);
mBitmap = ((BitmapDrawable) d).getBitmap();
}
