drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7a7369a8: Merge "Fix bug #8058390 Space is required after the battery sign in the RTL locales" into jb-mr2-dev

Browse Source 
* commit '7a7369a8acedb301efd8309440ebf2ad1409896d':
  Fix bug #8058390 Space is required after the battery sign in the RTL locales
This commit is contained in:
Fabrice Di Meglio
2013-03-08 22:46:59 +00:00
committed by Android Git Automerger
parent fe92f437b1 7a7369a8ac
commit 483b9198f4
17 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/res/layout-land/status_bar_help.xml
View File

@ -22,8 +22,8 @@
xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/status_bar_cling"
android:paddingLeft="40dp"
android:paddingRight="40dp"
android:paddingStart="40dp"
android:paddingEnd="40dp"
android:background="#DD000000"
android:focusable="true"
android:orientation="horizontal"
@ -34,7 +34,7 @@
android:layout_width="wrap_content"
android:layout_weight="0"
android:layout_height="wrap_content"
android:layout_marginRight="50dp"
android:layout_marginEnd="50dp"
android:gravity="center"
android:src="@drawable/arrow_dashed"
tools:ignore="ContentDescription" />
@ -64,8 +64,8 @@
style="@style/ClingButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="50dp"
android:paddingRight="50dp"
android:paddingStart="50dp"
android:paddingEnd="50dp"
android:text="@android:string/ok" />
</LinearLayout>
</LinearLayout>

6
packages/SystemUI/res/layout-land/status_bar_recent_item.xml
View File

@ -22,8 +22,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:paddingLeft="@dimen/status_bar_recents_item_padding"
android:paddingRight="@dimen/status_bar_recents_item_padding"
android:paddingStart="@dimen/status_bar_recents_item_padding"
android:paddingEnd="@dimen/status_bar_recents_item_padding"
android:importantForAccessibility="no"
android:clipChildren="false">
@ -72,7 +72,7 @@
android:fadingEdge="horizontal"
android:fadingEdgeLength="@dimen/status_bar_recents_text_fading_edge_length"
android:scrollHorizontally="true"
android:layout_alignLeft="@id/app_thumbnail"
android:layout_alignStart="@id/app_thumbnail"
android:layout_below="@id/app_thumbnail"
android:layout_marginTop="@dimen/status_bar_recents_text_description_padding"
android:layout_marginStart="@dimen/status_bar_recents_app_label_left_margin"

2
packages/SystemUI/res/layout-land/status_bar_search_panel.xml
View File

@ -36,7 +36,7 @@
android:id="@+id/search_panel_container"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true">
android:layout_alignParentEnd="true">
<com.android.internal.widget.multiwaveview.GlowPadView
android:id="@+id/glow_pad_view"

24
packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
View File

@ -54,7 +54,7 @@
android:layout_weight="1"
/>
<com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back"
android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"
android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"
android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_back"
systemui:keyCode="4"
@ -63,7 +63,7 @@
android:contentDescription="@string/accessibility_back"
/>
<com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home"
android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"
android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"
android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_home"
systemui:keyCode="3"
@ -73,7 +73,7 @@
android:contentDescription="@string/accessibility_home"
/>
<com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/recent_apps"
android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"
android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"
android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_recent"
android:layout_weight="0"
@ -112,7 +112,7 @@
android:layout_weight="1"
/>
<ImageView
android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"
android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"
android:layout_height="match_parent"
android:layout_marginStart="40dp"
android:src="@drawable/ic_sysbar_lights_out_dot_small"
@ -120,14 +120,14 @@
android:layout_weight="0"
/>
<ImageView
android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"
android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"
android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_lights_out_dot_large"
android:scaleType="center"
android:layout_weight="0"
/>
<ImageView
android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"
android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"
android:layout_marginEnd="40dp"
android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_lights_out_dot_small"
@ -195,7 +195,7 @@
android:layout_weight="1"
/>
<com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back"
android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"
android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"
android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_back"
systemui:keyCode="4"
@ -204,7 +204,7 @@
android:contentDescription="@string/accessibility_back"
/>
<com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home"
android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"
android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"
android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_home"
systemui:keyCode="3"
@ -214,7 +214,7 @@
android:contentDescription="@string/accessibility_home"
/>
<com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/recent_apps"
android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"
android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"
android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_recent"
android:layout_weight="0"
@ -253,7 +253,7 @@
android:layout_weight="1"
/>
<ImageView
android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"
android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"
android:layout_height="match_parent"
android:layout_marginStart="40dp"
android:src="@drawable/ic_sysbar_lights_out_dot_small"
@ -261,14 +261,14 @@
android:layout_weight="0"
/>
<ImageView
android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"
android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"
android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_lights_out_dot_large"
android:scaleType="center"
android:layout_weight="0"
/>
<ImageView
android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"
android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"
android:layout_marginEnd="40dp"
android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_lights_out_dot_small"

4
packages/SystemUI/res/layout/compat_mode_help.xml
View File

@ -52,7 +52,7 @@
android:background="@drawable/compat_mode_help_divider_bottom"
android:layout_marginBottom="55dp"
android:layout_marginEnd="80dp"
android:layout_alignLeft="@id/header"
android:layout_alignStart="@id/header"
android:layout_alignParentBottom="true"
>
<ImageView
@ -82,7 +82,7 @@
android:id="@+id/button"
android:layout_width="208dp"
android:layout_height="48dp"
android:layout_alignLeft="@id/header"
android:layout_alignStart="@id/header"
android:layout_alignParentBottom="true"
android:layout_marginBottom="20dp"
android:textSize="28sp"

4
packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml
View File

@ -24,7 +24,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="10dp"
android:paddingEnd="10dp"
android:src="@drawable/ic_qs_brightness_auto_off"
/>
<com.android.systemui.settings.ToggleSlider
@ -32,7 +32,7 @@
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_weight="1"
android:layout_marginRight="2dp"
android:layout_marginEnd="2dp"
android:layout_gravity="center_vertical"
systemui:text="@string/status_bar_settings_auto_brightness_label"
/>

16
packages/SystemUI/res/layout/status_bar.xml
View File

@ -34,7 +34,7 @@
android:id="@+id/notification_lights_out"
android:layout_width="@dimen/status_bar_icon_size"
android:layout_height="match_parent"
android:paddingLeft="6dip"
android:paddingStart="6dip"
android:paddingBottom="2dip"
android:src="@drawable/ic_sysbar_lights_out_dot_small"
android:scaleType="center"
@ -44,8 +44,8 @@
<LinearLayout android:id="@+id/status_bar_contents"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:paddingStart="6dip"
android:paddingEnd="6dip"
android:orientation="horizontal"
>
@ -86,7 +86,7 @@
android:id="@+id/signal_battery_cluster"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="2dp"
android:paddingStart="2dp"
android:orientation="horizontal"
android:gravity="center"
>
@ -99,7 +99,7 @@
android:id="@+id/battery"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:paddingLeft="4dip"
android:paddingStart="4dip"
/>
</LinearLayout>
@ -109,7 +109,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:singleLine="true"
android:paddingLeft="6dip"
android:paddingStart="6dip"
android:gravity="center_vertical|start"
/>
</LinearLayout>
@ -118,7 +118,7 @@
<LinearLayout android:id="@+id/ticker"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="6dip"
android:paddingStart="6dip"
android:animationCache="false"
android:orientation="horizontal" >
<ImageSwitcher android:id="@+id/tickerIcon"
@ -142,7 +142,7 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:paddingTop="2dip"
android:paddingRight="10dip">
android:paddingEnd="10dip">
<TextView
android:textAppearance="@style/TextAppearance.StatusBar.PhoneTicker"
android:layout_width="match_parent"

4
packages/SystemUI/res/layout/status_bar_expanded_header.xml
View File

@ -30,8 +30,8 @@
android:id="@+id/datetime"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:background="@drawable/ic_notify_button_bg"
android:enabled="false"
>

8
packages/SystemUI/res/layout/status_bar_help.xml
View File

@ -22,8 +22,8 @@
xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/status_bar_cling"
android:paddingLeft="40dp"
android:paddingRight="40dp"
android:paddingStart="40dp"
android:paddingEnd="40dp"
android:background="#DD000000"
android:focusable="true"
android:orientation="vertical"
@ -56,8 +56,8 @@
style="@style/ClingButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="50dp"
android:paddingRight="50dp"
android:paddingStart="50dp"
android:paddingEnd="50dp"
android:text="@android:string/ok" />
</LinearLayout>

4
packages/SystemUI/res/layout/status_bar_notification_row.xml
View File

@ -20,8 +20,8 @@
android:gravity="end"
android:layout_marginEnd="-80dp"
android:background="@null"
android:paddingRight="8dp"
android:paddingLeft="8dp"
android:paddingEnd="8dp"
android:paddingStart="8dp"
/>
<com.android.systemui.statusbar.LatestItemView android:id="@+id/content"

8
packages/SystemUI/res/layout/status_bar_toggle_slider.xml
View File

@ -36,15 +36,15 @@
android:layout_toEndOf="@id/toggle"
android:layout_centerVertical="true"
android:layout_alignParentEnd="true"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
/>
<TextView
android:id="@+id/label"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/toggle"
android:layout_alignRight="@id/toggle"
android:layout_alignStart="@id/toggle"
android:layout_alignEnd="@id/toggle"
android:layout_centerVertical="true"
android:gravity="center"
android:paddingTop="26dp"

4
packages/SystemUI/res/layout/system_bar.xml
View File

@ -91,8 +91,8 @@
<com.android.systemui.statusbar.policy.EventHole android:id="@+id/fake_space_bar"
android:layout_height="match_parent"
android:layout_width="0dp"
android:paddingLeft="8dip"
android:paddingRight="8dip"
android:paddingStart="8dip"
android:paddingEnd="8dip"
android:layout_toEndOf="@+id/navigationArea"
android:layout_toStartOf="@+id/notificationArea"
android:visibility="gone"

2
packages/SystemUI/res/layout/system_bar_compat_mode_panel.xml
View File

@ -22,7 +22,7 @@
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:paddingBottom="@dimen/panel_float"
android:paddingRight="20dp"
android:paddingEnd="20dp"
>
<RadioGroup android:id="@+id/compat_mode_radio_group"
android:background="@*android:drawable/dialog_full_holo_dark"

8
packages/SystemUI/res/layout/system_bar_input_methods_item.xml
View File

@ -24,8 +24,8 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:background="@drawable/status_bar_item_background"
android:orientation="vertical"
android:paddingRight="6dip"
android:paddingLeft="6dip"
android:paddingEnd="6dip"
android:paddingStart="6dip"
android:paddingTop="5dip"
android:paddingBottom="5dip"
android:gravity="center_vertical">
@ -89,8 +89,8 @@
android:layout_height="match_parent"
android:layout_marginStart="5dip"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"
android:paddingLeft="10dip"
android:paddingEnd="10dip"
android:paddingStart="10dip"
android:src="@drawable/ic_sysbar_quicksettings"
android:visibility="visible"
android:clickable="true"

8
packages/SystemUI/res/layout/system_bar_input_methods_panel.xml
View File

@ -57,8 +57,8 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:background="?android:attr/selectableItemBackground"
android:orientation="vertical"
android:paddingRight="6dip"
android:paddingLeft="30dip"
android:paddingEnd="6dip"
android:paddingStart="30dip"
android:paddingTop="5dip"
android:paddingBottom="5dip"
android:gravity="center_vertical"
@ -103,8 +103,8 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:background="?android:attr/selectableItemBackground"
android:orientation="vertical"
android:paddingRight="6dip"
android:paddingLeft="30dip"
android:paddingEnd="6dip"
android:paddingStart="30dip"
android:paddingTop="5dip"
android:paddingBottom="5dip"
android:gravity="center_vertical"

6
packages/SystemUI/res/layout/system_bar_notification_area.xml
View File

@ -84,7 +84,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:singleLine="true"
android:paddingLeft="6dip"
android:paddingStart="6dip"
android:layout_marginEnd="8dip"
android:gravity="center_vertical|start"
/>
@ -119,14 +119,14 @@
android:id="@+id/bluetooth"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:paddingLeft="4dip"
android:paddingStart="4dip"
android:visibility="gone"
/>
<ImageView
android:id="@+id/battery"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:paddingLeft="4dip"
android:paddingStart="4dip"
/>
</LinearLayout>
</LinearLayout>

18
packages/SystemUI/res/layout/system_bar_notification_panel_title.xml
View File

@ -23,9 +23,9 @@
android:layout_height="wrap_content"
android:clickable="true"
android:orientation="vertical"
android:paddingLeft="26dp"
android:paddingStart="26dp"
android:paddingTop="14dp"
android:paddingRight="26dp"
android:paddingEnd="26dp"
>
<TableLayout
@ -52,7 +52,7 @@
android:id="@+id/bluetooth"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:visibility="gone"
android:contentDescription="@null"
android:layout_gravity="center_vertical"
@ -65,7 +65,7 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="6dp"
android:paddingEnd="6dp"
>
<ImageView
@ -89,7 +89,7 @@
android:layout_gravity="start|center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="12dp"
android:paddingEnd="12dp"
android:singleLine="true"
android:ellipsize="end"
android:text="@string/status_bar_settings_settings_button"
@ -101,7 +101,7 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="6dp"
android:paddingEnd="6dp"
>
<ImageView
@ -125,7 +125,7 @@
android:layout_gravity="start|center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="12dp"
android:paddingEnd="12dp"
android:singleLine="true"
android:ellipsize="end"
android:text="@string/status_bar_settings_settings_button"
@ -138,7 +138,7 @@
android:scaleType="centerInside"
android:layout_gravity="center_vertical"
android:layout_alignBaseline="@id/wifi_signal"
android:paddingRight="6dp"
android:paddingEnd="6dp"
android:contentDescription="@null"
/>
@ -148,7 +148,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:paddingRight="2dp"
android:paddingEnd="2dp"
android:singleLine="true"
android:text="@string/status_bar_settings_settings_button"
/>