diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-08-12 09:29:22 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-08-12 09:29:22 -0700 |
commit | 4cc34823df8e420c366d4bf4497d7f906676a022 (patch) | |
tree | c680fe71fecbae11c23806f9e4f03d539cc62d2a | |
parent | 6cdb67062e0b5438164301506bfdae4095a3da59 (diff) | |
parent | 875711efe5ebbd1cd1ed05ee3ff56a0ecdfda0ec (diff) | |
download | android_packages_apps_Snap-4cc34823df8e420c366d4bf4497d7f906676a022.tar.gz android_packages_apps_Snap-4cc34823df8e420c366d4bf4497d7f906676a022.tar.bz2 android_packages_apps_Snap-4cc34823df8e420c366d4bf4497d7f906676a022.zip |
Merge "SnapdragonCamera: Fix submenu icon not display in RTL"
-rw-r--r-- | res/layout/list_sub_menu_item.xml | 3 | ||||
-rw-r--r-- | res/values/styles.xml | 2 | ||||
-rw-r--r-- | src/com/android/camera/ui/CheckedLinearLayout.java | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/res/layout/list_sub_menu_item.xml b/res/layout/list_sub_menu_item.xml index f2b043692..db417d689 100644 --- a/res/layout/list_sub_menu_item.xml +++ b/res/layout/list_sub_menu_item.xml @@ -36,12 +36,15 @@ android:layout_width="@dimen/setting_item_icon_width" android:layout_height="@dimen/setting_item_icon_width" android:layout_marginRight="@dimen/setting_item_list_margin" + android:layout_alignParentLeft="true" + android:layout_centerInParent="true" android:adjustViewBounds="true" android:scaleType="fitCenter" /> <TextView android:id="@+id/text" style="@style/CustomSettingItemTitle" + android:layout_toRightOf="@+id/image" android:shadowColor="@android:color/transparent" android:shadowDx="1" android:shadowDy="1" diff --git a/res/values/styles.xml b/res/values/styles.xml index f893aaa48..c6b99624e 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -85,7 +85,7 @@ <item name="android:gravity">left|center_vertical</item> <item name="android:singleLine">true</item> <item name="android:layout_weight">1</item> - <item name="android:layout_width">0dp</item> + <item name="android:layout_width">match_parent</item> <item name="android:layout_height">match_parent</item> </style> <style name="SettingItemTitle"> diff --git a/src/com/android/camera/ui/CheckedLinearLayout.java b/src/com/android/camera/ui/CheckedLinearLayout.java index 4e7750499..2acfd8b09 100644 --- a/src/com/android/camera/ui/CheckedLinearLayout.java +++ b/src/com/android/camera/ui/CheckedLinearLayout.java @@ -19,9 +19,9 @@ package com.android.camera.ui; import android.content.Context; import android.util.AttributeSet; import android.widget.Checkable; -import android.widget.LinearLayout; +import android.widget.RelativeLayout; -public class CheckedLinearLayout extends LinearLayout implements Checkable { +public class CheckedLinearLayout extends RelativeLayout implements Checkable { private static final int[] CHECKED_STATE_SET = { android.R.attr.state_checked }; |