Snap for 8661825 from 4f5a65d4bb to tm-qpr1-release

Change-Id: Ibfe0ddd53ff2b0000714824fca2c2e70e4403221

Android.bp

@@ -35,6 +35,15 @@ java_library {
     ],
 }
 
+java_library {
+    name: "Settings-change-ids",
+    srcs: ["src/com/android/settings/ChangeIds.java"],
+    libs: [
+        "app-compat-annotations",
+    ],
+}
+
+
 // Build the Settings APK
 android_library {
     name: "Settings-core",
@@ -77,18 +86,18 @@ android_library {
         "lottie",
         "WifiTrackerLib",
         "SettingsLibActivityEmbedding",
+        "Settings-change-ids",
     ],
 
     libs: [
         "telephony-common",
         "ims-common",
-        "app-compat-annotations",
     ],
 }
 
 platform_compat_config {
     name: "settings-platform-compat-config",
-    src: ":Settings-core",
+    src: ":Settings-change-ids",
     system_ext_specific: true,
 }
 
@@ -126,7 +135,7 @@ filegroup {
 // over all the sources together.
 filegroup {
     name: "Settings_srcs",
-    srcs: ["src/**/*.java"],
+    srcs: ["src/**/*.java", "src/**/*.kt"],
 }
 
 filegroup {

res/layout/accessibility_launch_activity_preference.xml

@@ -33,5 +33,6 @@
         android:layout_gravity="center_vertical"
         android:ellipsize="end"
         android:textAppearance="?android:attr/textAppearanceListItem"
+        android:hyphenationFrequency="normalFast"
         style="@style/MainSwitchText.Settingslib" />
 </LinearLayout>

res/layout/accessibility_shortcut_secondary_action.xml

@@ -59,6 +59,7 @@
                 android:layout_height="wrap_content"
                 android:singleLine="true"
                 android:textAppearance="?android:attr/textAppearanceListItem"
+                android:hyphenationFrequency="normalFast"
                 android:ellipsize="marquee" />
 
             <TextView
@@ -69,6 +70,7 @@
                 android:layout_alignStart="@android:id/title"
                 android:textAppearance="?android:attr/textAppearanceListItemSecondary"
                 android:textColor="?android:attr/textColorSecondary"
+                android:hyphenationFrequency="normalFast"
                 android:maxLines="10" />
 
         </RelativeLayout>

res/layout/apn_preference_layout.xml

@@ -51,6 +51,7 @@
             android:textAppearance="?android:attr/textAppearanceListItemSecondary"
             android:textColor="?android:attr/textColorSecondary"
             android:focusable="false"
+            android:hyphenationFrequency="normalFast"
             android:maxLines="2" />
 
     </RelativeLayout>

res/layout/app_preference_item.xml

@@ -56,6 +56,7 @@
             android:paddingEnd="7dip"
             android:ellipsize="marquee"
             android:duplicateParentState="true"
+            android:hyphenationFrequency="normalFast"
             />
         <TextView
             android:id="@android:id/summary"
@@ -67,6 +68,7 @@
             android:ellipsize="marquee"
             android:visibility="gone"
             android:duplicateParentState="true"
+            android:hyphenationFrequency="normalFast"
             />
     </LinearLayout>
     <TextView

res/layout/battery_active_view.xml

@@ -28,6 +28,7 @@
         android:layout_height="wrap_content"
         android:textAlignment="viewStart"
         android:textAppearance="?android:attr/textAppearanceMedium"
+        android:hyphenationFrequency="normalFast"
         android:textColor="?android:attr/textColorSecondary" />
 
     <com.android.settings.fuelgauge.BatteryActiveView

res/layout/homepage_preference.xml

@@ -62,6 +62,7 @@
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceListItem"
+            android:hyphenationFrequency="normalFast"
             android:ellipsize="marquee"/>
 
         <TextView
@@ -75,6 +76,7 @@
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorSecondary"
             android:maxLines="4"
+            android:hyphenationFrequency="normalFast"
             style="@style/PreferenceSummaryTextStyle"/>
     </RelativeLayout>
 </LinearLayout>

res/layout/horizontal_preference.xml

@@ -30,6 +30,7 @@
         android:textAppearance="?android:attr/textAppearanceListItem"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
+        android:hyphenationFrequency="normalFast"
         android:layout_weight="1" />
 
     <TextView
@@ -39,6 +40,7 @@
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:layout_weight="1"
+        android:hyphenationFrequency="normalFast"
         android:gravity="end|bottom" />
 
 </LinearLayout>

res/layout/notification_app.xml

@@ -38,6 +38,7 @@
         android:ellipsize="end"
         android:singleLine="true"
         android:textAlignment="viewStart"
+        android:hyphenationFrequency="normalFast"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <TextView
@@ -50,6 +51,7 @@
         android:singleLine="true"
         android:textAlignment="viewStart"
         android:textColor="?android:attr/textColorSecondary"
+        android:hyphenationFrequency="normalFast"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <View

res/layout/preference_app_restrictions.xml

@@ -61,6 +61,7 @@
                 android:singleLine="true"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:ellipsize="marquee"
+                android:hyphenationFrequency="normalFast"
                 android:fadingEdge="horizontal"/>
             <TextView
                 android:id="@android:id/summary"
@@ -74,6 +75,7 @@
                 android:textSize="13sp"
                 android:textColor="?android:attr/textColorSecondary"
                 android:focusable="false"
+                android:hyphenationFrequency="normalFast"
                 android:maxLines="4" />
         </RelativeLayout>
     </LinearLayout>

res/layout/preference_balance_slider.xml

@@ -45,6 +45,7 @@
                 android:textAppearance="?android:attr/textAppearanceListItem"
                 android:textColor="?android:attr/textColorPrimary"
                 android:ellipsize="marquee"
+                android:hyphenationFrequency="normalFast"
                 android:fadingEdge="horizontal"/>
             <LinearLayout
                 android:id="@android:id/widget_frame"

res/layout/preference_icon.xml

@@ -57,6 +57,7 @@
             android:layout_below="@android:id/title"
             android:layout_alignStart="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceSmall"
+            android:hyphenationFrequency="normalFast"
             android:maxLines="2" />
 
     </RelativeLayout>

res/layout/preference_labeled_slider.xml

@@ -35,6 +35,7 @@
         android:fadingEdge="horizontal"
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceListItem"
+        android:hyphenationFrequency="normalFast"
         android:textColor="?android:attr/textColorPrimary" />
 
     <TextView
@@ -44,6 +45,7 @@
         android:layout_below="@android:id/title"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textAlignment="viewStart"
+        android:hyphenationFrequency="normalFast"
         android:textColor="?android:attr/textColorSecondary" />
 
     <include

res/layout/preference_multiline_title.xml

@@ -38,6 +38,7 @@
             android:textColor="?android:attr/textColorPrimary"
             android:textAlignment="center"
             android:ellipsize="marquee"
+            android:hyphenationFrequency="normalFast"
             android:fadingEdge="horizontal" />
 
         <TextView
@@ -50,6 +51,7 @@
             android:textAlignment="viewStart"
             android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
             android:textColor="?android:attr/textColorSecondary"
+            android:hyphenationFrequency="normalFast"
             android:maxLines="10" />
 
     </RelativeLayout>

res/layout/preference_progress_category.xml

@@ -47,6 +47,7 @@
         android:layout_weight="1"
         android:layout_gravity="start|center"
         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"
+        android:hyphenationFrequency="normalFast"
         android:textColor="?android:attr/colorAccent"/>
 
     <ProgressBar

res/layout/preference_radio_with_extra_widget.xml

@@ -75,6 +75,7 @@
                   android:layout_weight="1"
                   android:textAppearance="?android:attr/textAppearanceSmall"
                   android:textAlignment="viewStart"
+                  android:hyphenationFrequency="normalFast"
                   android:textColor="?android:attr/textColorSecondary" />
     </LinearLayout>
     <LinearLayout

res/layout/preference_single_target.xml

@@ -76,6 +76,7 @@
                 android:layout_alignStart="@android:id/title"
                 android:textAppearance="?android:attr/textAppearanceListItemSecondary"
                 android:textColor="?android:attr/textColorSecondary"
+                android:hyphenationFrequency="normalFast"
                 android:maxLines="10" />
 
         </RelativeLayout>

res/layout/preference_two_target_radio.xml

@@ -73,6 +73,7 @@
                 android:layout_alignStart="@android:id/title"
                 android:textAppearance="?android:attr/textAppearanceListItemSecondary"
                 android:textColor="?android:attr/textColorSecondary"
+                android:hyphenationFrequency="normalFast"
                 android:maxLines="10" />
 
         </RelativeLayout>

res/layout/radio_with_summary.xml

@@ -33,6 +33,7 @@
         android:gravity="center_vertical"
         android:paddingStart="20dp"
         android:drawableStart="?android:attr/listChoiceIndicatorSingle"
+        android:hyphenationFrequency="normalFast"
         android:ellipsize="marquee" />
 
 
@@ -43,6 +44,7 @@
         android:paddingStart="52dp"
         android:textAppearance="?android:attr/textAppearanceListItemSecondary"
         android:textColor="?android:attr/textColorSecondary"
+        android:hyphenationFrequency="normalFast"
         android:maxLines="10" />
 
 </com.android.settings.CheckableLinearLayout>

res/layout/running_services_app_item.xml

@@ -55,6 +55,7 @@
             android:ellipsize="marquee"
             android:fadingEdge="horizontal"
             android:maxLines="2"
+            android:hyphenationFrequency="normalFast"
             android:textAppearance="?android:attr/textAppearanceListItem"/>
 
         <TextView
@@ -63,6 +64,7 @@
             android:layout_height="wrap_content"
             android:textDirection="locale"
             android:textAppearance="?android:attr/textAppearanceSmall"
+            android:hyphenationFrequency="normalFast"
             android:textColor="?android:attr/textColorSecondary"/>
 
     </LinearLayout>

res/layout/settings_summary_preference.xml

@@ -32,6 +32,7 @@
         android:paddingTop="0dp"
         android:textColor="?android:attr/textColorPrimary"
         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Display1"
+        android:hyphenationFrequency="normalFast"
         />
 
     <TextView android:id="@android:id/summary"
@@ -40,6 +41,7 @@
         android:textAppearance="?android:attr/textAppearanceListItemSecondary"
         android:textColor="?android:attr/textColorSecondary"
         android:paddingBottom="5dp"
+        android:hyphenationFrequency="normalFast"
         android:maxLines="10" />
 
     <ProgressBar

src/com/android/settings/ChangeIds.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.compat.annotation.ChangeId;
+import android.compat.annotation.LoggingOnly;
+
+/**
+ * All the {@link ChangeId} used for Settings App.
+ */
+public class ChangeIds {
+    /**
+     * Intents with action {@code android.settings.MANAGE_APP_OVERLAY_PERMISSION}
+     * and data URI scheme {@code package} don't go to the app-specific screen for managing the
+     * permission anymore. Instead, they redirect to this screen for managing all the apps that have
+     * requested such permission.
+     */
+    @ChangeId
+    @LoggingOnly
+    public static final long CHANGE_RESTRICT_SAW_INTENT = 135920175L;
+}

src/com/android/settings/applications/manageapplications/ManageApplications.java

@@ -18,6 +18,7 @@ package com.android.settings.applications.manageapplications;
 
 import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
 
+import static com.android.settings.ChangeIds.CHANGE_RESTRICT_SAW_INTENT;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ALL;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_BLOCKED;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_DISABLED;
@@ -37,8 +38,6 @@ import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.settings.SettingsEnums;
 import android.app.usage.IUsageStatsManager;
-import android.compat.annotation.ChangeId;
-import android.compat.annotation.LoggingOnly;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -190,16 +189,6 @@ public class ManageApplications extends InstrumentedFragment
     public static final int STORAGE_TYPE_DEFAULT = 0; // Show all apps that are not categorized.
     public static final int STORAGE_TYPE_LEGACY = 1;  // Show apps even if they can be categorized.
 
-    /**
-     * Intents with action {@code android.settings.MANAGE_APP_OVERLAY_PERMISSION}
-     * and data URI scheme {@code package} don't go to the app-specific screen for managing the
-     * permission anymore. Instead, they redirect to this screen for managing all the apps that have
-     * requested such permission.
-     */
-    @ChangeId
-    @LoggingOnly
-    private static final long CHANGE_RESTRICT_SAW_INTENT = 135920175L;
-
     // sort order
     @VisibleForTesting
     int mSortOrder = R.id.sort_order_alpha;

src/com/android/settings/core/SettingsBaseActivity.java

@@ -15,6 +15,8 @@
  */
 package com.android.settings.core;
 
+import static android.text.Layout.HYPHENATION_FREQUENCY_NORMAL_FAST;
+
 import android.annotation.LayoutRes;
 import android.app.ActivityManager;
 import android.content.ComponentName;
@@ -106,6 +108,7 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
             mAppBarLayout = findViewById(R.id.app_bar);
             if (mCollapsingToolbarLayout != null) {
                 mCollapsingToolbarLayout.setLineSpacingMultiplier(TOOLBAR_LINE_SPACING_MULTIPLIER);
+                mCollapsingToolbarLayout.setHyphenationFrequency(HYPHENATION_FREQUENCY_NORMAL_FAST);
             }
             disableCollapsingToolbarLayoutScrollingBehavior();
         } else {