Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
diff --git a/res/xml/apps.xml b/res/xml/apps.xml
index 90c40a6..85d187c 100644
--- a/res/xml/apps.xml
+++ b/res/xml/apps.xml
@@ -112,18 +112,20 @@
android:title="@string/advanced_apps"
android:order="21"
android:visibility="gone"
- settings:searchable="false"/>
+ settings:searchable="false"
+ settings:controller="com.android.settings.widget.PreferenceCategoryController">
- <Preference
- android:key="aspect_ratio_apps"
- android:title="@string/aspect_ratio_experimental_title"
- android:summary="@string/summary_placeholder"
- android:order="22"
- settings:controller="com.android.settings.applications.appcompat.UserAspectRatioAppsPreferenceController"
- android:fragment="com.android.settings.applications.manageapplications.ManageApplications">
- <extra android:name="classname"
- android:value="com.android.settings.Settings$UserAspectRatioAppListActivity"/>
- <intent android:action="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS"/>
- </Preference>
+ <Preference
+ android:key="aspect_ratio_apps"
+ android:title="@string/aspect_ratio_experimental_title"
+ android:summary="@string/summary_placeholder"
+ android:order="22"
+ settings:controller="com.android.settings.applications.appcompat.UserAspectRatioAppsPreferenceController"
+ android:fragment="com.android.settings.applications.manageapplications.ManageApplications">
+ <extra android:name="classname"
+ android:value="com.android.settings.Settings$UserAspectRatioAppListActivity"/>
+ <intent android:action="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS"/>
+ </Preference>
+ </PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/user_aspect_ratio_details.xml b/res/xml/user_aspect_ratio_details.xml
index f95b678..44a7589 100644
--- a/res/xml/user_aspect_ratio_details.xml
+++ b/res/xml/user_aspect_ratio_details.xml
@@ -21,6 +21,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/aspect_ratio_experimental_title">
+ <com.android.settingslib.widget.TopIntroPreference
+ android:key="app_aspect_ratio_summary"
+ android:order="-1001"
+ android:title="@string/summary_placeholder"
+ settings:searchable="false"/>
+
<com.android.settingslib.widget.ActionButtonsPreference
android:key="header_view" />
diff --git a/src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java b/src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java
index ff68fb0..4211424 100644
--- a/src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java
+++ b/src/com/android/settings/applications/appcompat/UserAspectRatioAppsPreferenceController.java
@@ -43,6 +43,6 @@
@Override
public CharSequence getSummary() {
- return mContext.getResources().getString(R.string.aspect_ratio_summary, Build.MODEL);
+ return mContext.getResources().getString(R.string.aspect_ratio_summary_text, Build.MODEL);
}
}
diff --git a/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java b/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
index 81741b7..dfb583c 100644
--- a/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
+++ b/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
@@ -30,6 +30,7 @@
import android.app.IActivityManager;
import android.content.Intent;
import android.content.pm.PackageManager;
+import android.os.Build;
import android.os.Bundle;
import android.os.RemoteException;
import android.os.UserHandle;
@@ -57,6 +58,7 @@
RadioWithImagePreference.OnClickListener {
private static final String TAG = UserAspectRatioDetails.class.getSimpleName();
+ private static final String KEY_HEADER_SUMMARY = "app_aspect_ratio_summary";
private static final String KEY_HEADER_BUTTONS = "header_view";
private static final String KEY_PREF_FULLSCREEN = "fullscreen_pref";
private static final String KEY_PREF_HALF_SCREEN = "half_screen_pref";
@@ -203,6 +205,10 @@
private void initPreferences() {
addPreferencesFromResource(R.xml.user_aspect_ratio_details);
+ final String summary = getContext().getResources().getString(
+ R.string.aspect_ratio_main_summary, Build.MODEL);
+ findPreference(KEY_HEADER_SUMMARY).setTitle(summary);
+
((ActionButtonsPreference) findPreference(KEY_HEADER_BUTTONS))
.setButton1Text(R.string.launch_instant_app)
.setButton1Icon(R.drawable.ic_settings_open)
diff --git a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
index 0121826..533d920 100644
--- a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
+++ b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
@@ -96,7 +96,7 @@
@Composable
@VisibleForTesting
- fun getSummary(): String = stringResource(R.string.aspect_ratio_summary, Build.MODEL)
+ fun getSummary(): String = stringResource(R.string.aspect_ratio_summary_text, Build.MODEL)
}
@Composable
@@ -110,7 +110,7 @@
appList = appList,
header = {
Box(Modifier.padding(SettingsDimension.itemPadding)) {
- SettingsBody(stringResource(R.string.aspect_ratio_main_summary, Build.MODEL))
+ SettingsBody(stringResource(R.string.aspect_ratio_main_summary_text, Build.MODEL))
}
Illustration(object : IllustrationModel {
override val resId = R.raw.user_aspect_ratio_education
diff --git a/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt
index 98b393e..1126cc5 100644
--- a/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt
+++ b/tests/spa_unit/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProviderTest.kt
@@ -68,7 +68,7 @@
fun injectEntry_summary() {
setInjectEntry()
composeTestRule
- .onNodeWithText(context.getString(R.string.aspect_ratio_summary, Build.MODEL))
+ .onNodeWithText(context.getString(R.string.aspect_ratio_summary_text, Build.MODEL))
.assertIsDisplayed()
}