Switch the default text selection handles to Material style.

-Switch to material style handles.
-Delete old handles.
-Remove the unrelated use of old handle in a test.

Bug: 28723844
Change-Id: I268c2672df541e5a1cdcdeb6712289fe06c06d5f

20 files changed, 10 insertions, 15 deletions

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 d2ed06dd5a17..000000000000
--- a/core/res/res/drawable-hdpi/text_select_handle_left.png
+++ /dev/null
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 be2dc6811148..000000000000
--- a/core/res/res/drawable-hdpi/text_select_handle_middle.png
+++ /dev/null
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 e4192499b95b..000000000000
--- a/core/res/res/drawable-hdpi/text_select_handle_right.png
+++ /dev/null
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 bded42cc9639..000000000000
--- a/core/res/res/drawable-ldpi/text_select_handle_left.png
+++ /dev/null
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 c1d8d17da717..000000000000
--- a/core/res/res/drawable-ldpi/text_select_handle_middle.png
+++ /dev/null
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 aae0b4076551..000000000000
--- a/core/res/res/drawable-ldpi/text_select_handle_right.png
+++ /dev/null
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 750cdea505da..000000000000
--- a/core/res/res/drawable-mdpi/text_select_handle_left.png
+++ /dev/null
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 3cdca907c958..000000000000
--- a/core/res/res/drawable-mdpi/text_select_handle_middle.png
+++ /dev/null
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 fc3d14497fdb..000000000000
--- a/core/res/res/drawable-mdpi/text_select_handle_right.png
+++ /dev/null
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 98d10c92928b..000000000000
--- a/core/res/res/drawable-xhdpi/text_select_handle_left.png
+++ /dev/null
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 058b30b731bc..000000000000
--- a/core/res/res/drawable-xhdpi/text_select_handle_middle.png
+++ /dev/null
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 b3a0c9f47ec3..000000000000
--- a/core/res/res/drawable-xhdpi/text_select_handle_right.png
+++ /dev/null
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 849760122137..000000000000
--- a/core/res/res/drawable-xxhdpi/text_select_handle_left.png
+++ /dev/null
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 7b74f669e416..000000000000
--- a/core/res/res/drawable-xxhdpi/text_select_handle_middle.png
+++ /dev/null
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 25e07806560a..000000000000
--- a/core/res/res/drawable-xxhdpi/text_select_handle_right.png
+++ /dev/null
diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml
index c083a5eb9ae9..30e23f5124c5 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 29818df192e4..7ed293f44594 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 bf7718e7eeb7..998eea5ac9ab 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -248,9 +248,9 @@ please see themes_device_defaults.xml.
         <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 677051aa0dd5..8f73479e95ac 100644
--- a/core/res/res/values/themes_holo.xml
+++ b/core/res/res/values/themes_holo.xml
@@ -247,9 +247,9 @@ please see themes_device_defaults.xml.
         <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 @@ please see themes_device_defaults.xml.
         <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 df7e3bbf78fa..cbf99dc46a45 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 @@ public class AssetsAtlasActivity extends Activity {
         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();
         }