Settings: unconditionally enable 5GHz and 6GHz hotspots

Android.bp

@@ -103,6 +103,7 @@ android_library {
         "settings-logtags",
         "settings-telephony-protos-lite",
         "statslog-settings",
+        "ReverseWirelessCharging"
     ],
 
     plugins: ["androidx.room_room-compiler-plugin"],

AndroidManifest.xml

@@ -139,11 +139,13 @@
     <uses-permission android:name="android.permission.REMAP_MODIFIER_KEYS" />
     <uses-permission android:name="android.permission.ACCESS_GPU_SERVICE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="app.grapheneos.logviewer.SHOW_LOGCAT" />
 
     <application
             android:name=".SettingsApplication"
             android:label="@string/settings_label"
-            android:icon="@drawable/ic_launcher_settings"
+            android:icon="@mipmap/ic_launcher"
+            android:roundIcon="@mipmap/ic_launcher_round"
             android:theme="@style/Theme.Settings"
             android:hardwareAccelerated="true"
             android:requiredForAllUsers="true"
@@ -467,6 +469,19 @@
                 android:value="true" />
         </activity>
 
+        <!-- this is supposed to be used both for wifi and mobile data, controlled by flags -->
+        <activity
+            android:name=".network.InternetSetupActivity"
+            android:theme="@style/GlifV4Theme.DayNight"
+            android:exported="true">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.SETUP_INTERNET" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
+
         <activity
             android:name=".wifi.WifiPickerActivity"
             android:permission="android.permission.CHANGE_WIFI_STATE"
@@ -2892,6 +2907,8 @@
                        android:value="com.android.settings.development.DevelopmentSettingsDashboardFragment" />
             <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
                        android:value="@string/menu_key_system"/>
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
         </activity>
 
         <activity
@@ -5020,12 +5037,70 @@
                 android:value="@string/menu_key_apps"/>
         </activity-alias>
 
+        <provider
+            android:name="com.android.settings.sudconfig.SudConfigProvider"
+            android:authorities="com.google.android.setupwizard.partner"
+            android:directBootAware="true"
+            android:exported="true" />
+
         <!-- [b/197780098] Disable eager initialization of Jetpack libraries. -->
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
             tools:node="remove" />
 
         <!-- This is the longest AndroidManifest.xml ever. -->
+
+        <activity
+            android:name="Settings$AppNativeDebuggingActivity"
+            android:permission="android.permission.WRITE_SECURE_SETTINGS"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.settings.OPEN_APP_NATIVE_DEBUGGING_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.applications.appinfo.AppNativeDebuggingFragment"/>
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                android:value="@string/menu_key_apps"/>
+        </activity>
+
+        <activity
+            android:name="Settings$AppMemtagActivity"
+            android:permission="android.permission.WRITE_SECURE_SETTINGS"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.settings.OPEN_APP_MEMTAG_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.applications.appinfo.AppMemtagFragment"/>
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                android:value="@string/menu_key_apps"/>
+        </activity>
+
+        <activity
+            android:name="Settings$AppHardenedMallocActivity"
+            android:permission="android.permission.WRITE_SECURE_SETTINGS"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.settings.OPEN_APP_HARDENED_MALLOC_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.applications.appinfo.AppHardenedMallocFragment"/>
+            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+                android:value="@string/menu_key_apps"/>
+        </activity>
+
     </application>
 </manifest>

res-product/values-bs/strings.xml

@@ -283,7 +283,7 @@
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="2025941326724094318">"Zatamnite ekran više od minimalne osvijetljenosti telefona"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="3106979202311807559">"Zatamnite ekran više od minimalne osvijetljenosti tableta"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="9162440023310121356">"Dodatno zatamnjenje može biti korisno u slučajevima: &lt;ol&gt; &lt;li&gt; kada je zadana minimalna osvijetljenost telefona i dalje presvijetla&lt;/li&gt; &lt;li&gt; kada koristite telefon u tamnom okruženju, naprimjer noću ili u tamnoj sobi prije spavanja&lt;/li&gt; &lt;/ol&gt;"</string>
-    <string name="reduce_bright_colors_preference_subtitle" product="tablet" msgid="5747242697890472822">"Dodatno zatamnjivanje može biti korisno u slučajevima: &lt;ol&gt; &lt;li&gt; kada je zadana minimalna osvijetljenost tableta i dalje presvijetla&lt;/li&gt; &lt;li&gt; kada koristite tablet u tamnim okruženjima, naprimjer noću ili u tamnoj sobi prije spavanja&lt;/li&gt; &lt;/ol&gt;"</string>
+    <string name="reduce_bright_colors_preference_subtitle" product="tablet" msgid="5747242697890472822">"Dodatno zatamnjenje može biti korisno u slučajevima: &lt;ol&gt; &lt;li&gt; kada je zadana minimalna osvijetljenost tableta i dalje presvijetla&lt;/li&gt; &lt;li&gt; kada koristite tablet u tamnim okruženjima, naprimjer noću ili u tamnoj sobi prije spavanja&lt;/li&gt; &lt;/ol&gt;"</string>
     <string name="battery_tip_summary_summary" product="default" msgid="1880496476760792933">"Telefon ima uobičajenu potrošnju baterije u pozadini"</string>
     <string name="battery_tip_summary_summary" product="tablet" msgid="865695079664997057">"Tablet ima uobičajenu potrošnju baterije u pozadini"</string>
     <string name="battery_tip_summary_summary" product="device" msgid="45436555475195632">"Uređaj ima uobičajenu potrošnju baterije u pozadini"</string>

res-product/values-fr/strings.xml

@@ -283,7 +283,7 @@
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="2025941326724094318">"Diminuer encore la luminosité minimale du téléphone"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="3106979202311807559">"Diminuer encore la luminosité minimale de la tablette"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="9162440023310121356">"Encore moins lumineux peut être utile dans les cas suivants : &lt;ol&gt; &lt;li&gt; La luminosité minimale par défaut de votre téléphone est encore trop forte&lt;/li&gt; &lt;li&gt; Vous utilisez votre téléphone dans le noir (par exemple, la nuit ou dans une pièce sans éclairage avant de vous endormir)&lt;/li&gt; &lt;/ol&gt;"</string>
-    <string name="reduce_bright_colors_preference_subtitle" product="tablet" msgid="5747242697890472822">"La fonctionnalité Encore moins lumineux peut être utile dans les cas suivants : &lt;ol&gt; &lt;li&gt; La luminosité minimale par défaut de votre tablette est encore trop forte&lt;/li&gt; &lt;li&gt; Vous utilisez votre tablette dans le noir (par exemple, la nuit ou dans une pièce sans éclairage avant de vous endormir)&lt;/li&gt; &lt;/ol&gt;"</string>
+    <string name="reduce_bright_colors_preference_subtitle" product="tablet" msgid="5747242697890472822">"La fonctionnalité Luminosité ultra-réduite peut être utile dans les cas suivants : &lt;ol&gt; &lt;li&gt; La luminosité minimale par défaut de votre tablette est encore trop forte&lt;/li&gt; &lt;li&gt; Vous utilisez votre tablette dans le noir (par exemple, la nuit ou dans une pièce sans éclairage avant de vous endormir)&lt;/li&gt; &lt;/ol&gt;"</string>
     <string name="battery_tip_summary_summary" product="default" msgid="1880496476760792933">"L\'utilisation en arrière-plan de la batterie par le téléphone est normale"</string>
     <string name="battery_tip_summary_summary" product="tablet" msgid="865695079664997057">"L\'utilisation en arrière-plan de la batterie par la tablette est normale"</string>
     <string name="battery_tip_summary_summary" product="device" msgid="45436555475195632">"L\'utilisation en arrière-plan de la batterie par l\'appareil est normale"</string>

res-product/values-zh-rCN/strings.xml

@@ -265,8 +265,8 @@
     <string name="bluetooth_tethering_subtext" product="default" msgid="3638886236597805392">"通过蓝牙共享手机的互联网连接"</string>
     <string name="ethernet_tethering_subtext" product="default" msgid="8652438909365718644">"通过以太网共享手机的互联网连接"</string>
     <string name="ethernet_tethering_subtext" product="tablet" msgid="2227710549796706455">"通过以太网共享平板电脑的互联网连接"</string>
-    <string name="about_settings" product="tablet" msgid="1471390492111370330">"关于平板电脑"</string>
-    <string name="about_settings" product="default" msgid="2621311564780208250">"关于手机"</string>
+    <string name="about_settings" product="tablet" msgid="1471390492111370330">"关于本机"</string>
+    <string name="about_settings" product="default" msgid="2621311564780208250">"关于本机"</string>
     <string name="about_settings" product="device" msgid="7595574154492383452">"关于设备"</string>
     <string name="about_settings" product="emulator" msgid="1099246296173401003">"关于模拟设备"</string>
     <string name="install_all_warning" product="tablet" msgid="1732116924846572063">"您的平板电脑和个人数据更容易受到未知应用的攻击。安装来自该来源的应用即表示，您同意对因使用这些应用可能导致的平板电脑损坏或数据丢失承担责任。"</string>
@@ -315,7 +315,7 @@
     <string name="user_cannot_manage_message" product="default" msgid="8596259161937605316">"只有手机的机主可以管理用户。"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="6880861846664267876">"您将丢失自己在这台平板电脑上的空间和数据，此操作无法撤消。"</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="3209762447055039706">"您将丢失自己在这部手机上的空间和数据，此操作无法撤消。"</string>
-    <string name="support_summary" product="default" msgid="2044721479256103419">"帮助文章、电话与聊天支持"</string>
+    <string name="support_summary" product="default" msgid="2044721479256103419">"帮助中心文章、电话与聊天支持"</string>
     <string name="support_summary" product="tablet" msgid="2588832599234347108">"帮助文章、平板电脑与聊天支持"</string>
     <string name="support_summary" product="device" msgid="6821511162132497205">"帮助文章、设备与聊天支持"</string>
     <string name="ambient_display_title" product="default" msgid="8027137727044125809">"点按两次即显示"</string>

res/drawable/baseline_wifi.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3 3,-3c-1.65,-1.66 -4.34,-1.66 -6,0zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z" />
+</vector>

res/drawable/baseline_wifi_glif.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:width="?attr/sudGlifIconSize"
+        android:height="?attr/sudGlifIconSize"
+        android:drawable="@drawable/baseline_wifi" />
+</layer-list>

res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,30 @@
+<!--
+  Copyright (C) 2021 Google Inc.
+
+  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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <group
+        android:scaleX="2.277"
+        android:scaleY="2.277"
+        android:translateX="26.676"
+        android:translateY="26.676">
+        <path
+            android:fillColor="#000000"
+            android:pathData="M19.5,12c0,-0.23 -0.01,-0.45 -0.03,-0.68l1.86,-1.41c0.4,-0.3 0.51,-0.86 0.26,-1.3l-1.87,-3.23c-0.25,-0.44 -0.79,-0.62 -1.25,-0.42l-2.15,0.91c-0.37,-0.26 -0.76,-0.49 -1.17,-0.68l-0.29,-2.31C14.8,2.38 14.37,2 13.87,2h-3.73C9.63,2 9.2,2.38 9.14,2.88L8.85,5.19c-0.41,0.19 -0.8,0.42 -1.17,0.68L5.53,4.96c-0.46,-0.2 -1,-0.02 -1.25,0.42L2.41,8.62c-0.25,0.44 -0.14,0.99 0.26,1.3l1.86,1.41C4.51,11.55 4.5,11.77 4.5,12s0.01,0.45 0.03,0.68l-1.86,1.41c-0.4,0.3 -0.51,0.86 -0.26,1.3l1.87,3.23c0.25,0.44 0.79,0.62 1.25,0.42l2.15,-0.91c0.37,0.26 0.76,0.49 1.17,0.68l0.29,2.31C9.2,21.62 9.63,22 10.13,22h3.73c0.5,0 0.93,-0.38 0.99,-0.88l0.29,-2.31c0.41,-0.19 0.8,-0.42 1.17,-0.68l2.15,0.91c0.46,0.2 1,0.02 1.25,-0.42l1.87,-3.23c0.25,-0.44 0.14,-0.99 -0.26,-1.3l-1.86,-1.41C19.49,12.45 19.5,12.23 19.5,12zM12.04,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5s3.5,1.57 3.5,3.5S13.97,15.5 12.04,15.5z" />
+    </group>
+</vector>

res/drawable/ic_settings_install.xml

@@ -18,7 +18,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
   <path
       android:fillColor="#FF000000"
       android:pathData="M18,15v3H6v-3H4v3c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-3H18z"/>

res/layout/face_enroll_introduction.xml

@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/BiometricEnrollIntroTitle"
-                android:text="@string/security_settings_face_enroll_introduction_info_title" />
+                android:text="@string/security_settings_face_enroll_introduction_info_title_en" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -156,7 +156,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/BiometricEnrollIntroTitle"
-                android:text="@string/security_settings_face_enroll_introduction_how_title" />
+                android:text="@string/security_settings_face_enroll_introduction_how_title_en" />
 
             <TextView
                 android:id="@+id/how_message"

res/layout/settings_main_prefs.xml

@@ -34,40 +34,38 @@
         android:layout_height="0dp"
         android:layout_weight="1"/>
 
-    <RelativeLayout android:id="@+id/button_bar"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:layout_weight="0"
-                    android:visibility="gone">
-
-        <Button android:id="@+id/back_button"
-                android:layout_width="150dip"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dip"
-                android:layout_alignParentStart="true"
-                android:text="@*android:string/back_button_label"/>
-
-        <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true">
-
-            <Button android:id="@+id/skip_button"
-                    android:layout_width="150dip"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="5dip"
-                    android:text="@*android:string/skip_button_label"
-                    android:visibility="gone"/>
+    <!-- button bar is used only by activities that use setupdesign-->
+    <RelativeLayout
+        android:id="@+id/button_bar"
+        style="@style/SudGlifButtonBar.Stackable"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone">
 
-            <Button android:id="@+id/next_button"
-                    android:layout_width="150dip"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="5dip"
-                    android:text="@*android:string/next_button_label"/>
+        <Button
+            android:id="@+id/back_button"
+            style="@style/SudGlifButton.Secondary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_marginEnd="@dimen/sud_glif_button_margin_end"
+            android:text="@*android:string/back_button_label" />
 
-        </LinearLayout>
+        <Button
+            android:id="@+id/skip_button"
+            style="@style/SudGlifButton.Secondary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toEndOf="@id/back_button"
+            android:text="@*android:string/skip_button_label"
+            android:visibility="gone" />
 
+        <Button
+            android:id="@+id/next_button"
+            style="@style/SudGlifButton.Primary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:text="@*android:string/next_button_label" />
     </RelativeLayout>
-
 </LinearLayout>

res/layout/wifi_network_config.xml

@@ -694,7 +694,7 @@
                      android:layout_height="wrap_content"
                      style="@style/wifi_item_spinner"
                      android:prompt="@string/wifi_privacy_settings"
-                     android:entries="@array/wifi_privacy_entries"/>
+                     android:entries="@array/wifi_privacy_entries_extended"/>
         </LinearLayout>
 
         <LinearLayout

res/mipmap-anydpi/ic_launcher.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>