diff options
author | kaiyiz <kaiyiz@codeaurora.org> | 2014-09-15 10:28:08 +0800 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:29:31 -0600 |
commit | 7315e94eff1019d678b723d621dc407e2d3e12ab (patch) | |
tree | 4b6455c28b2da8f7b052ede1c17c51a06c4f5b36 | |
parent | a8866e2a5166b017ad36289c79ff9ec9291154b3 (diff) | |
download | android_packages_apps_Stk-7315e94eff1019d678b723d621dc407e2d3e12ab.tar.gz android_packages_apps_Stk-7315e94eff1019d678b723d621dc407e2d3e12ab.tar.bz2 android_packages_apps_Stk-7315e94eff1019d678b723d621dc407e2d3e12ab.zip |
Stk: Reginal requirement for RTL
Add flag for RTL support in manifest.
Convert left/right layout properties to start/end properties.
Keep the entry list LTR to follow the Arabic custom.
Change-Id: I4b2eff5b262f9bb9ea21c79b944921fec1ac7e2f
-rw-r--r-- | AndroidManifest.xml | 3 | ||||
-rw-r--r-- | res/layout/stk_event_msg.xml | 1 | ||||
-rw-r--r-- | res/layout/stk_input.xml | 13 | ||||
-rw-r--r-- | res/layout/stk_menu_item.xml | 5 | ||||
-rw-r--r-- | res/layout/stk_menu_list.xml | 1 | ||||
-rw-r--r-- | res/layout/stk_msg_dialog.xml | 13 | ||||
-rw-r--r-- | res/layout/stk_title.xml | 11 | ||||
-rw-r--r-- | res/layout/stk_tone_dialog.xml | 1 |
8 files changed, 28 insertions, 20 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 668a99e..1cac861 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -30,7 +30,8 @@ android:label="@string/app_name" android:clearTaskOnLaunch="true" android:process="com.android.phone" - android:taskAffinity="android.task.stk"> + android:taskAffinity="android.task.stk" + android:supportsRtl="true"> <activity android:name="StkMain" android:theme="@android:style/Theme.NoDisplay" diff --git a/res/layout/stk_event_msg.xml b/res/layout/stk_event_msg.xml index d07a2c0..afb4338 100644 --- a/res/layout/stk_event_msg.xml +++ b/res/layout/stk_event_msg.xml @@ -22,6 +22,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" + android:layoutDirection="ltr" android:background="@android:drawable/toast_frame"> <ImageView android:id="@android:id/icon" diff --git a/res/layout/stk_input.xml b/res/layout/stk_input.xml index 9c3807e..746ddcf 100644 --- a/res/layout/stk_input.xml +++ b/res/layout/stk_input.xml @@ -17,6 +17,7 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" + android:layoutDirection="locale" android:layout_height="wrap_content"> <LinearLayout android:layout_width="match_parent" @@ -39,18 +40,18 @@ android:visibility="visible" android:orientation="vertical" android:layout_width="match_parent" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" + android:layout_marginStart="10dip" + android:layout_marginEnd="10dip" android:layout_height="wrap_content"> <LinearLayout android:id="@+id/input_restriction_info" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="4dip" + android:layout_marginStart="4dip" android:orientation="horizontal"> <TextView android:id="@+id/input_type" - android:gravity="left" + android:gravity="start" android:textColor="@color/ltgrey" android:layout_width="wrap_content" android:layout_height="wrap_content" /> @@ -59,7 +60,7 @@ android:textColor="@color/ltgrey" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="4dip" /> + android:layout_marginStart="4dip" /> </LinearLayout> <EditText android:id="@+id/in_text" @@ -89,7 +90,7 @@ android:text="@string/button_yes" /> <Button android:id="@+id/button_no" - android:layout_marginLeft="10dip" + android:layout_marginStart="10dip" android:layout_width="100sp" android:layout_height="wrap_content" android:textStyle="bold" diff --git a/res/layout/stk_menu_item.xml b/res/layout/stk_menu_item.xml index bfddb81..b8dfd84 100644 --- a/res/layout/stk_menu_item.xml +++ b/res/layout/stk_menu_item.xml @@ -19,6 +19,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" + android:layoutDirection="ltr" android:orientation="horizontal"> <ImageView @@ -27,7 +28,7 @@ android:layout_width="@android:dimen/app_icon_size" android:layout_height="@android:dimen/app_icon_size" android:layout_gravity="center_vertical" - android:layout_marginLeft="5dip" + android:layout_marginStart="5dip" /> <TextView @@ -38,7 +39,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="center_vertical" - android:layout_marginLeft="9dip" + android:layout_marginStart="9dip" /> </LinearLayout> diff --git a/res/layout/stk_menu_list.xml b/res/layout/stk_menu_list.xml index 3872e1f..1ba0047 100644 --- a/res/layout/stk_menu_list.xml +++ b/res/layout/stk_menu_list.xml @@ -18,6 +18,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layoutDirection="ltr" android:orientation="vertical" > <!-- Include stk title layout. --> diff --git a/res/layout/stk_msg_dialog.xml b/res/layout/stk_msg_dialog.xml index c1c163c..356fa1a 100644 --- a/res/layout/stk_msg_dialog.xml +++ b/res/layout/stk_msg_dialog.xml @@ -18,6 +18,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layoutDirection="locale" android:orientation="vertical" > <LinearLayout android:id="@+id/messagePanel" @@ -31,8 +32,8 @@ android:fillViewport="true" android:paddingTop="2dip" android:paddingBottom="12dip" - android:paddingLeft="14dip" - android:paddingRight="10dip"> + android:paddingStart="14dip" + android:paddingEnd="10dip"> <TextView android:id="@+id/dialog_message" style="?android:attr/textAppearanceMedium" android:layout_width="match_parent" @@ -52,13 +53,13 @@ android:orientation="horizontal" android:background="@color/ltgrey" android:paddingTop="4dip" - android:paddingLeft="2dip" - android:paddingRight="2dip" > + android:paddingStart="2dip" + android:paddingEnd="2dip" > <Button android:id="@+id/button_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="left" + android:layout_gravity="start" android:layout_weight="1" android:maxLines="2" android:text="@string/button_cancel" /> @@ -66,7 +67,7 @@ android:id="@+id/button_ok" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" + android:layout_gravity="end" android:layout_weight="1" android:maxLines="2" android:text="@string/button_ok" /> diff --git a/res/layout/stk_title.xml b/res/layout/stk_title.xml index e63a46e..4186784 100644 --- a/res/layout/stk_title.xml +++ b/res/layout/stk_title.xml @@ -18,6 +18,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" + android:layoutDirection="ltr" android:fitsSystemWindows="true"> <LinearLayout android:id="@+id/stk_title" @@ -36,10 +37,10 @@ <ImageView android:id="@+id/title_icon" android:layout_width="16dip" android:layout_height="16dip" - android:layout_marginLeft="2dip" - android:layout_marginRight="9dip" + android:layout_marginStart="2dip" + android:layout_marginEnd="9dip" android:layout_gravity="center_vertical" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:scaleType="fitCenter" /> <TextView android:id="@+id/title_text" @@ -52,14 +53,14 @@ <LinearLayout android:id="@+id/right_container" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_centerVertical="true"> <ProgressBar android:id="@+id/progress_bar" style="?android:attr/progressBarStyleSmallTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="5dip" + android:layout_marginStart="5dip" android:layout_centerVertical="true" android:visibility="gone" android:max="10000" /> diff --git a/res/layout/stk_tone_dialog.xml b/res/layout/stk_tone_dialog.xml index 391ef1a..b43029f 100644 --- a/res/layout/stk_tone_dialog.xml +++ b/res/layout/stk_tone_dialog.xml @@ -22,6 +22,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:orientation="vertical" + android:layoutDirection="locale" android:padding="14dip"> <ImageView |