Merge "Fix user photo popup layout for RTL"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 35c0f45..a228da5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1520,6 +1520,8 @@
<activity android:name=".deviceinfo.Status"
android:label="@string/device_status_activity_title"
android:theme="@style/Theme.SubSettingsDialogWhenLarge"
+ android:taskAffinity="com.android.settings"
+ android:parentActivityName="Settings$DeviceInfoSettingsActivity"
android:process="com.android.phone">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/res/layout/radio_with_summary.xml b/res/layout/radio_with_summary.xml
index 87b1d14..5b89591 100644
--- a/res/layout/radio_with_summary.xml
+++ b/res/layout/radio_with_summary.xml
@@ -19,6 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingEnd="?android:attr/dialogPreferredPadding"
android:orientation="vertical"
android:background="?android:attr/selectableItemBackground"
android:minHeight="?android:attr/listPreferredItemHeightSmall">
@@ -31,7 +32,6 @@
android:textColor="?android:attr/textColorAlertDialogListItem"
android:gravity="center_vertical"
android:paddingStart="20dp"
- android:paddingEnd="?android:attr/dialogPreferredPadding"
android:drawableStart="?android:attr/listChoiceIndicatorSingle"
android:ellipsize="marquee" />
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 2628c7f..8d6bd55 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -120,6 +120,8 @@
mSwitchBar = activity.getSwitchBar();
mSwitch = mSwitchBar.getSwitch();
mSwitchBar.show();
+
+ setHasOptionsMenu(true);
}
@Override