Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b67dff06 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

am a004f28a: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic,... 

am a004f28a: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev

* commit 'a004f28a':
  Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
parents bc5a364b a004f28a

api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ package android { 
    field public static final int checkboxStyle = 16842860; // 0x101006c

    field public static final int checked = 16843014; // 0x1010106

    field public static final int checkedButton = 16843080; // 0x1010148

    field public static final int checkedTextViewStyle = 16843720; // 0x10103c8

    field public static final int childDivider = 16843025; // 0x1010111

    field public static final int childIndicator = 16843020; // 0x101010c

    field public static final int childIndicatorLeft = 16843023; // 0x101010f
@@ -1789,6 +1790,7 @@ package android { 
    field public static final int Widget_DeviceDefault_Button_Small = 16974146; // 0x1030142

    field public static final int Widget_DeviceDefault_Button_Toggle = 16974148; // 0x1030144

    field public static final int Widget_DeviceDefault_CalendarView = 16974190; // 0x103016e

    field public static final int Widget_DeviceDefault_CheckedTextView = 16974299; // 0x10301db

    field public static final int Widget_DeviceDefault_CompoundButton_CheckBox = 16974152; // 0x1030148

    field public static final int Widget_DeviceDefault_CompoundButton_RadioButton = 16974169; // 0x1030159

    field public static final int Widget_DeviceDefault_CompoundButton_Star = 16974173; // 0x103015d
@@ -1822,6 +1824,7 @@ package android { 
    field public static final int Widget_DeviceDefault_Light_Button_Small = 16974198; // 0x1030176

    field public static final int Widget_DeviceDefault_Light_Button_Toggle = 16974200; // 0x1030178

    field public static final int Widget_DeviceDefault_Light_CalendarView = 16974238; // 0x103019e

    field public static final int Widget_DeviceDefault_Light_CheckedTextView = 16974300; // 0x10301dc

    field public static final int Widget_DeviceDefault_Light_CompoundButton_CheckBox = 16974204; // 0x103017c

    field public static final int Widget_DeviceDefault_Light_CompoundButton_RadioButton = 16974224; // 0x1030190

    field public static final int Widget_DeviceDefault_Light_CompoundButton_Star = 16974228; // 0x1030194
@@ -1907,6 +1910,7 @@ package android { 
    field public static final int Widget_Holo_Button_Small = 16973964; // 0x103008c

    field public static final int Widget_Holo_Button_Toggle = 16973966; // 0x103008e

    field public static final int Widget_Holo_CalendarView = 16974060; // 0x10300ec

    field public static final int Widget_Holo_CheckedTextView = 16974297; // 0x10301d9

    field public static final int Widget_Holo_CompoundButton_CheckBox = 16973969; // 0x1030091

    field public static final int Widget_Holo_CompoundButton_RadioButton = 16973986; // 0x10300a2

    field public static final int Widget_Holo_CompoundButton_Star = 16973990; // 0x10300a6
@@ -1940,6 +1944,7 @@ package android { 
    field public static final int Widget_Holo_Light_Button_Small = 16974007; // 0x10300b7

    field public static final int Widget_Holo_Light_Button_Toggle = 16974009; // 0x10300b9

    field public static final int Widget_Holo_Light_CalendarView = 16974061; // 0x10300ed

    field public static final int Widget_Holo_Light_CheckedTextView = 16974298; // 0x10301da

    field public static final int Widget_Holo_Light_CompoundButton_CheckBox = 16974012; // 0x10300bc

    field public static final int Widget_Holo_Light_CompoundButton_RadioButton = 16974032; // 0x10300d0

    field public static final int Widget_Holo_Light_CompoundButton_Star = 16974036; // 0x10300d4

core/java/android/widget/CheckedTextView.java

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public class CheckedTextView extends TextView implements Checkable { 
    }



    public CheckedTextView(Context context, AttributeSet attrs) {

        this(context, attrs, 0);

        this(context, attrs, R.attr.checkedTextViewStyle);

    }



    public CheckedTextView(Context context, AttributeSet attrs, int defStyle) {

core/res/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -483,6 +483,8 @@ 
        <attr name="autoCompleteTextViewStyle" format="reference" />

        <!-- Default Checkbox style. -->

        <attr name="checkboxStyle" format="reference" />

        <!-- Default CheckedTextView style. -->

        <attr name="checkedTextViewStyle" format="reference" />

        <!-- Default ListView style for drop downs. -->

        <attr name="dropDownListViewStyle" format="reference" />

        <!-- Default EditText style. -->

core/res/res/values/public.xml

+5 −5
Original line number Diff line number Diff line
@@ -2018,10 +2018,10 @@ 
  <public type="attr" name="permissionGroupFlags" id="0x010103c5" />

  <public type="attr" name="labelFor" id="0x010103c6" />

  <public type="attr" name="permissionFlags" id="0x010103c7" />

  



<!-- ===============================================================

     Resources added in next version of platform

     =============================================================== -->

  <public type="attr" name="checkedTextViewStyle" />

  <public type="style" name="Widget.Holo.CheckedTextView" />

  <public type="style" name="Widget.Holo.Light.CheckedTextView" />

  <public type="style" name="Widget.DeviceDefault.CheckedTextView" />

  <public type="style" name="Widget.DeviceDefault.Light.CheckedTextView" />



</resources>

core/res/res/values/styles.xml

+11 −1
Original line number Diff line number Diff line
@@ -465,6 +465,10 @@ please see styles_device_defaults.xml. 
        <item name="android:textCursorDrawable">?android:attr/textCursorDrawable</item>

    </style>



    <style name="Widget.CheckedTextView">

        <item name="android:textAlignment">viewStart</item>

    </style>



    <style name="Widget.TextView.ListSeparator">

        <item name="android:background">@android:drawable/dark_header_dither</item>

        <item name="android:layout_width">match_parent</item>
@@ -1589,6 +1593,9 @@ please see styles_device_defaults.xml. 
    <style name="Widget.Holo.TextView" parent="Widget.TextView">

    </style>



    <style name="Widget.Holo.CheckedTextView" parent="Widget.CheckedTextView">

    </style>



    <style name="Widget.Holo.TextView.ListSeparator" parent="Widget.TextView.ListSeparator">

        <item name="android:background">@android:drawable/list_section_divider_holo_dark</item>

        <item name="android:textAllCaps">true</item>
@@ -2017,6 +2024,9 @@ please see styles_device_defaults.xml. 
    <style name="Widget.Holo.Light.TextView" parent="Widget.TextView">

    </style>



    <style name="Widget.Holo.Light.CheckedTextView" parent="Widget.CheckedTextView">

    </style>



    <style name="Widget.Holo.Light.TextView.ListSeparator" parent="Widget.TextView.ListSeparator">

        <item name="android:background">@android:drawable/list_section_divider_holo_light</item>

        <item name="android:textAllCaps">true</item>