Commit Graph

30312 Commits

Author SHA1 Message Date
Randy Pfohl
e66986f9ba Merge "update navigation mode settings string" into udc-qpr-dev am: fa0371ae8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24722205

Change-Id: I15e425196150f48d06f8fe83d7b8463be1107fc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 17:09:16 +00:00
Alan Huang
b839780f23 Update the Spatial audio strings for tablet.
Test: manual build and check on tablet
Bug: 298003807
Change-Id: I242c42103bca633ac0ed0b925a4624c1c8e4fb42
2023-09-14 01:00:49 +08:00
Randy Pfohl
fa0371ae8f Merge "update navigation mode settings string" into udc-qpr-dev 2023-09-13 16:27:51 +00:00
Yiyi Shen
b9acbfac55 Merge "Update the Fast Pair integration wording." into main 2023-09-13 14:08:38 +00:00
Wentao Wang
f11e1666bf Merge "Separate the demo user factory reset option with admin user factory reset option." into udc-qpr-dev am: 38f12abb75 am: 0d3ae3ed32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24677431

Change-Id: Ie89643b620ee82e4f30ab98ca466f54bd68b8067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 13:53:24 +00:00
Wentao Wang
0d3ae3ed32 Merge "Separate the demo user factory reset option with admin user factory reset option." into udc-qpr-dev am: 38f12abb75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24677431

Change-Id: I1c3d89346991f82f994a230db385ef2c523b067a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 13:01:39 +00:00
Wentao Wang
38f12abb75 Merge "Separate the demo user factory reset option with admin user factory reset option." into udc-qpr-dev 2023-09-13 11:51:21 +00:00
Wentao Wang
a44e75d6ed Separate the demo user factory reset option with admin user factory reset option.
A security vulnerability was discovered by Android security. b/292548775 Within a short period of time after the device reboot, the user could enter the settings page and factory reset the device. Android Enterprise suggests to add DISALLOW_FACTORY_RESET user restriction to the device.

However, DISALLOW_FACTORY_RESET will be enabled on all Android users, including both the admin user and the demo user. The existing behavior in Android settings is that once the user restriction is set, factory reset button will be greyed out, which makes the factory reset functionality in demo user go away.

In demo user, the factory reset command will be forwarded to the current active device owner. So in this change, we separate the button for admin user and the button for demo user.

In demo user, the button is still visible when the restriction is set.

And in admin user, the button will be greyed out as expected.

Once this change is in, then Pixel Retail Demo could set the user restriction properly and rely on its internal logic to do factory reset. If other applications are trying to do the factory reset, it will be denied by OS.

BUG: 292548775
Change-Id: I9d2d47bb29bc2c1e05058b246908768cd2f95990
2023-09-13 11:47:11 +00:00
Bill Yi
f77fcdcc19 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8a557ef105f4b4ae478b44b850630fdb3df5f16c
2023-09-13 03:55:35 -07:00
Bill Yi
51f5fc71d9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia2624bb908efe3396c7d5d6e26e2e5554deae5c1
2023-09-13 03:50:57 -07:00
Yiyi Shen
f4e20cbfe0 Update the Fast Pair integration wording.
Bug: 296507968
Test: Manual
Change-Id: I9fedb998f71c82ab825e6701a0ac42058a7aac60
2023-09-13 18:03:29 +08:00
Graciela Putri
a727cea119 Merge "Change aspect ratio summary and footer text" into udc-qpr-dev am: dd34fa54e4 am: f862ff58f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24679072

Change-Id: I0ba709c1187c099e5eccc9a4e0ab69d5559f9336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 08:54:57 +00:00
mxyyiyi
6b8daefd54 Impl highlight effect on BatteryChartView slots. am: 6750634259 am: 9e4fed1b62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24498956

Change-Id: I9a38284ab828c149ca06a51fbad7f3fcb2ac33de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 08:54:29 +00:00
Graciela Putri
f862ff58f0 Merge "Change aspect ratio summary and footer text" into udc-qpr-dev am: dd34fa54e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24679072

Change-Id: I1fcf366127ea502b3351c8f6a94d601281df4a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 07:58:10 +00:00
mxyyiyi
9e4fed1b62 Impl highlight effect on BatteryChartView slots. am: 6750634259
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24498956

Change-Id: Iff96ebb33e50b2c2bddbe44eada5bf35f7118531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 07:57:45 +00:00
Graciela Putri
dd34fa54e4 Merge "Change aspect ratio summary and footer text" into udc-qpr-dev 2023-09-13 07:14:13 +00:00
mxyyiyi
6750634259 Impl highlight effect on BatteryChartView slots.
Screenshot: https://screenshot.googleplex.com/F5VrGjj5kdNHMV6

Bug: 284893240
Bug: 291689623
Test: manual
Change-Id: I846d95d31e8bb839481b86a94d5191ff205f8328
2023-09-13 13:29:32 +08:00
Guojing Yuan
756d23cad1 [CDM] Add Permissions Sync toggle
Bug: 290063372

Test: manually tested the toggle
Change-Id: I75d4370eed98275e2f99d65620229bdb57193fb8
2023-09-12 18:02:38 +00:00
Graciela Wissen Putri
c37c8b8789 Change aspect ratio summary and footer text
Add more education for device user that setting aspect ratio has not
been tested by the app developer. Move Aspect ratio under Apps >
Advanced instead of General.

Fix: 296160724
Test: atest UserAspectRatioAppsPageProviderTest
Change-Id: I2078f285d7bfb8de3a61c69f9d0ff3872d683ed4
2023-09-12 16:56:10 +00:00
Massimo Carli
e3c53f39a3 Merge "Changed app string changes in user aspect ratio settings" into udc-qpr-dev am: 951bbde355 am: 7d297719d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24721236

Change-Id: I75fbcbb10b149bc16b2deead7645df992572e7a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 12:11:47 +00:00
Massimo Carli
7d297719d7 Merge "Changed app string changes in user aspect ratio settings" into udc-qpr-dev am: 951bbde355
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24721236

Change-Id: I8e95d9e9704649cbcb3eed980e3d0275116b4c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 11:16:24 +00:00
Massimo Carli
24aa9c8f15 Changed app string changes in user aspect ratio settings
Bug: 297288214
Test: Manual

Change-Id: I72c0b53d8d9db92b12d4e9507fcf40b1be76d745
2023-09-12 06:29:19 +00:00
randypfohl
aeb3bd3df5 update navigation mode settings string
Test: built locally, verified with screenshot

Bug:293110731

Change-Id: I4c57eca43c6f4ce8ede515ee52096e4449d88b2b
2023-09-11 12:24:47 -07:00
Manish Singh
7cd9300c1d Merge "Add Private Space settings page" into main 2023-09-11 12:52:05 +00:00
Chaohui Wang
98ade3ae18 Merge "Clean up WifiDataUsageSummaryPreferenceController" into main 2023-09-08 08:03:18 +00:00
Treehugger Robot
f9607c2b43 Merge "The new About > Account behavior" into main 2023-09-08 00:42:33 +00:00
Bill Yi
458e8cc311 Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2023-09-07 23:43:06 +00:00
Bill Yi
2527e8855f Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-09-07 22:56:10 +00:00
Manish Singh
27c3987860 Add Private Space settings page
This involves:
1. Adding a new page for PS settings under Security & Privacy
2. Integrating the PS safety source with SafetyCenter.

Also, add the capability to create and delete PS from the page.
Creation is temporary to help with prototyping, and will be removed
finally.

Screenshots:
Private Space Entry point in Security & Privacy Settings:
https://screenshot.googleplex.com/4VHxNekjhxZHJwF

Private Space Settings page:
https://screenshot.googleplex.com/3Raw4wuymTHTgtM

Creating Private Space:
https://screenshot.googleplex.com/3dvzAH6V4kQmuYf

Private Space created:
https://screenshot.googleplex.com/Aj7nnF9uuUCa9Q5

Design doc:
https://docs.google.com/document/d/1CdjUjAE84-5ZEPRIfw5KYFjLVHtEZxc_sF0w95su8DA/edit?usp=sharing&resourcekey=0-dAACT9HRexY1IyoxMmkVlw

Bug: 286539356
Bug: 293569406
Test: manual
Test: atest DeletePrivateSpaceControllerTest
Test: atest UseOneLockControllerTest
Test: atest HidePrivateSpaceControllerTest
Change-Id: I9caf8e04e7fb2df36e60f607225e2931988ee692
2023-09-07 18:12:53 +01:00
Bill Yi
0071351cfc Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I79f55f0afe719e019225ea96a442a066ab33e4f3
2023-09-07 04:15:45 -07:00
Bill Yi
219f3c68fa Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I18aa01b928c2e48302ed95acf15cdeec11c1c3e5
2023-09-07 04:13:48 -07:00
Bill Yi
2c4039be6d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1807ea56cbfaa846e77ba40b2c330f931e826715
2023-09-06 20:53:50 -07:00
Bill Yi
35b82f2c87 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1bc80785e0a6c6d9576749bf5d47f607e5b9ed56
2023-09-06 20:49:17 -07:00
Sunny Shao
b44fb93aa8 The new About > Account behavior
- Change the display content of the summary while multiple accounts.
- Goto the Passwords & accounts page when users click Account item.

Fixes: 290593956
Test: atest BrandedAccountPreferenceControllerTest
Change-Id: Iae32803076d86455f52f2ffd278e06995161adfe
2023-09-07 07:40:41 +08:00
Shivangi Dubey
00a78fca41 Merge "Refine fold setting" into udc-qpr-dev am: 26e14e09bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24314953

Change-Id: Iaf6c0514a406267de5924672b1e879a4dce3ce4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 15:06:39 +00:00
dshivangi
7435bbc70a Refine fold setting
Current fold setting has a toggle button which can enable the “Stay unlocked on fold” setting.
Create a new page for fold setting which will allow us to choose something from three options.(https://screenshot.googleplex.com/6W65aTYtigGpr3v)
 *Always - Front display turns on when you fold your device [Currently available setting]
 *Only games, videos, and more - Front display turns on for apps that stop your screen going idle [Default]
 *Never - Front display locks when you fold your device [New option for user]

Test: atest FoldLockBehaviorSettingsTest FoldLockBehaviorPreferenceControllerTest
*Manual
  Flash the build with these changes
  Manually select options one by one
  Observe the behavior

Fixes: 294194379
Change-Id: Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367
Merged-In: Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367
2023-09-06 10:52:12 +00:00
Shivangi Dubey
25825c8329 Merge "Refine fold setting" into main 2023-09-06 10:47:31 +00:00
Chaohui Wang
4b686147b6 Clean up WifiDataUsageSummaryPreferenceController
Which is legacy and not finished implemented.

Bug: 295260929
Test: unit test
Test: robo test
Test: manual - on Mobile Settings page
Test: manual - on Network details page
Change-Id: I30ac639c1ba285a74038d5413b63e2c31c6cc8ba
2023-09-06 17:37:02 +08:00
Xin Li
770a4e1f11 Merge "Merge UP1A.230905.019" into aosp-main-future 2023-09-05 18:35:36 +00:00
Chaohui Wang
a9a819a5d7 Merge "Remove duplicated metered & privacy spinner" into main 2023-09-04 11:04:46 +00:00
Chaohui Wang
0d129f77f0 Remove duplicated metered & privacy spinner
From Wi-Fi dialog when there are already same settings in the Wi-Fi
detail page.
This makes simpler for the user and help fix the inconsistent issue.

Fix: 297036035
Test: manual - open Wi-Fi dialog from Wi-Fi detail page
Test: robo test
Change-Id: Ic02658d91938db78b91e867a923260aa2610ae49
2023-09-04 17:10:17 +08:00
Yiyi Shen
a82c257002 Merge "Add a new section to show eligible Fast Pair devices." into main 2023-09-04 08:25:11 +00:00
Kean Mariotti
4ed4885aa8 Merge "Revert^2 Remove Winscope tracing QS development tile" into main 2023-09-04 07:50:36 +00:00
Yiyi Shen
71d9c21856 Add a new section to show eligible Fast Pair devices.
The section only show at most 3 devices. If the device list size is
greater than 3, we will show a "See all".
The device Preference is ordered. FastPairDeviceUpdater will handle the
order logic.
Bug: 296507968
Test: FastPairDevicePreferenceControllerTest

Change-Id: I9692d5740dbc31ff50db0ebbf2c5535b726277c9
2023-09-04 11:32:32 +08:00
dshivangi
dc485887cc Refine fold setting
Current fold setting has a toggle button which can enable the “Stay unlocked on fold” setting.
Create a new page for fold setting which will allow us to choose something from three options.(https://screenshot.googleplex.com/6W65aTYtigGpr3v)
 *Always - Front display turns on when you fold your device [Currently available setting]
 *Only games, videos, and more - Front display turns on for apps that stop your screen going idle [Default]
 *Never - Front display locks when you fold your device [New option for user]

Test: atest FoldLockBehaviorSettingsTest FoldLockBehaviorPreferenceControllerTest
*Manual
  Flash the build with these changes
  Manually select options one by one
  Observe the behavior

Fixes: 294194379
Change-Id: Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367
2023-09-01 14:43:22 +00:00
Justin McClain
b675bb6d3a Merge "Remote authenticator enrollment navigation." into main 2023-09-01 11:48:35 +00:00
Kean Mariotti
95b375e2b4 Revert^2 Remove Winscope tracing QS development tile
This commit removes the obsolete QS development tile for Winscope
tracing as now Winscope traces can be collected via Traceur.

Bug: 295816837
Test: N/A
Change-Id: I7658537579cd054af092945aab553a4e17997273
2023-09-01 10:36:29 +00:00
Xinyi Mao
5bad30b3db Merge "Impl app anomlay preference" into udc-qpr-dev am: c51a3da148 am: 428b124bea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24404174

Change-Id: I147d8496db00a770d8de45229813ae146e1e87cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 09:54:53 +00:00
SongFerng Wang
0f253cd7e5 Merge "ListPreference setEnable as defualt disable at network and sim page" into main 2023-09-01 09:19:54 +00:00
Xinyi Mao
428b124bea Merge "Impl app anomlay preference" into udc-qpr-dev am: c51a3da148
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24404174

Change-Id: I7068d880ab644f01dba523132dbccd2cc6ceff60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 08:59:18 +00:00