Merge "Switch the default text selection handles to Material style." into nyc-dev

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>

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" />

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="textSelectHandleLeft">@drawable/text_select_handle_left_material</item>
-        <item name="textSelectHandleRight">@drawable/text_select_handle_right</item>
+        <item name="textSelectHandleRight">@drawable/text_select_handle_right_material</item>
-        <item name="textSelectHandle">@drawable/text_select_handle_middle</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>

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="textSelectHandleLeft">@drawable/text_select_handle_left_material</item>
-        <item name="textSelectHandleRight">@drawable/text_select_handle_right</item>
+        <item name="textSelectHandleRight">@drawable/text_select_handle_right_material</item>
-        <item name="textSelectHandle">@drawable/text_select_handle_middle</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="textSelectHandleLeft">@drawable/text_select_handle_left_material</item>
-        <item name="textSelectHandleRight">@drawable/text_select_handle_right</item>
+        <item name="textSelectHandleRight">@drawable/text_select_handle_right_material</item>
-        <item name="textSelectHandle">@drawable/text_select_handle_middle</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>
 

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();
         }