PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
135,251 Commits 1 Branch 0 Tags
033c33e287f0681c48cd080fab144373edc1242c
Commit Graph

135251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Graciela Putri
033c33e287 Merge "Add aspect ratio title strings for translation" into udc-qpr-dev am: c7757a00d3 am: 5faa0d8d2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24733894

Change-Id: I6b06c715428abeed6400f99eb1b8f1b6d3b03410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 12:37:35 +00:00
Graciela Putri
5faa0d8d2f Merge "Add aspect ratio title strings for translation" into udc-qpr-dev am: c7757a00d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24733894

Change-Id: Iea368681c3021e23f33ba8ea5e61de4e5618360d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 11:45:48 +00:00
Graciela Putri
c7757a00d3 Merge "Add aspect ratio title strings for translation" into udc-qpr-dev 2023-09-14 11:06:09 +00:00
Charlotte Lu
6cace3a05f Merge "Add flag to change to the new APN page." into main 2023-09-14 10:46:11 +00:00
Graciela Wissen Putri
57816e8cf6 Add aspect ratio title strings for translation 
For the purpose of translation, we are adding all possible permutations
of aspect ratio titles/labels.

Bug: 300219974
Test: Manual
Change-Id: Id0a63098f773ed7cd5e3bdf043633e7ea4a9202f
 2023-09-14 08:45:30 +00:00
Milton Wu
2c114331aa Merge "[BiometricsV2] Ignore ui tests" into main 2023-09-14 05:59:41 +00:00
Bill Yi
18b2309d22 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: a9dafd684c -s ours am: 0d72215c72 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745010

Change-Id: Ib7fb15ac5fe5a7b8ecf8cf919037ba7cb4b25b5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 03:19:51 +00:00
Bill Yi
7ab2411d9b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 67f2c30f07 -s ours am: 69621a6507 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745010

Change-Id: I26161f99596ae9fc6161f90aa3ef5f7be1b8c83d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 03:19:49 +00:00
Bill Yi
4cb885ae3b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 547444fcf9 -s ours am: 3a0e0371be -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745008

Change-Id: I0e1a35b2c0fb47277371e1a94b662f0d7d7d7c03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 03:19:46 +00:00
Bill Yi
46dc4918d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f77fcdcc19 -s ours am: 93d3c81dd7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745008

Change-Id: Iab325c8730c1ef8b9b22484cc95c83969989d715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 03:19:44 +00:00
Bill Yi
c09d1d9d50 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 77e9b3e439 -s ours am: 37b524bcb4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744006

Change-Id: I9c5f01c842f7cfbe37338d2e1c4a958fcfeb5a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 03:19:33 +00:00
Bill Yi
4a6b08e671 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51f5fc71d9 -s ours am: 61b3d62e5f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744006

Change-Id: Iad71b02322bfeb43c1a4689a9b6ec2b129341d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 03:19:18 +00:00
Bill Yi
0d72215c72 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: a9dafd684c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745010

Change-Id: Ib3396c59242d2f582af9138cf6085184b910eb5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 02:36:05 +00:00
Bill Yi
69621a6507 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 67f2c30f07 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745010

Change-Id: I29c132ad2c05640318f6175c9baead62becb75dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 02:36:01 +00:00
Bill Yi
3a0e0371be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 547444fcf9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745008

Change-Id: Ib91f69c00f3175ad5c2233e412dd52248dc0f75d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 02:35:57 +00:00
Bill Yi
93d3c81dd7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f77fcdcc19 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745008

Change-Id: I7ffe65ac35a4f3953b6f2a424c20845a55adac41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 02:35:42 +00:00
Bill Yi
37b524bcb4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 77e9b3e439 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744006

Change-Id: I3a4b81212c98c11bb4026a5da1b6249c457f8758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 02:35:32 +00:00
Bill Yi
61b3d62e5f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51f5fc71d9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744006

Change-Id: I26489bb2b17f0059a07bb4dbd1efbf3074ec733b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 02:35:18 +00:00
Bill Yi
a9dafd684c Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-09-14 02:07:40 +00:00
Bill Yi
547444fcf9 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-09-14 02:07:40 +00:00
Bill Yi
77e9b3e439 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-09-14 02:07:40 +00:00
Bill Yi
2127868ff7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 460579f2b3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744948

Change-Id: If966cd91ed1743fee821b507f1977179fcda5208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 22:15:15 +00:00
Hao Dong
eea9199c9d Merge "Use FingerprintSensorType in shared lib." into main 2023-09-13 22:09:34 +00:00
Anvesh Renikindi
dc37fd1c99 [automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into aosp-main-future am: 7bed4aade8 -s ours am: d783537f9f -s ours am: a5a031f98b -s ours am: a73a6376ea -s ours 
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669

Change-Id: I71ed1d60155b4118ccb3b4606d2fa2938260b9ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 19:45:30 +00:00
Chaohui Wang
a171278aa2 [automerger skipped] Remove ExperimentalLifecycleComposeApi am: 5d8fea06b1 -s ours am: 55a2fe7bd2 -s ours am: bc7f3e566d -s ours am: 78778776b4 -s ours 
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669

Change-Id: Ie2c18003e2815b949be5cc09def0404ccf1e50bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 19:45:23 +00:00
Anvesh Renikindi
a73a6376ea [automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into aosp-main-future am: 7bed4aade8 -s ours am: d783537f9f -s ours am: a5a031f98b -s ours 
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669

Change-Id: I81a8769871af6ba9f3763c51eff0956449ed4a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 18:43:01 +00:00
Chaohui Wang
78778776b4 [automerger skipped] Remove ExperimentalLifecycleComposeApi am: 5d8fea06b1 -s ours am: 55a2fe7bd2 -s ours am: bc7f3e566d -s ours 
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669

Change-Id: Iab736130de88e7d267a07685d56f0f783a9b0a46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 18:42:55 +00:00
Hao Dong
ae289cf1a2 Use FingerprintSensorType in shared lib. 
This CL uses FingerprintSensorType so that we don't need
to expose server to view models.

Test: atest FingerprintSettingsViewModelTest
Bug: 295206773

Change-Id: I93010d833c256c789b64cfa98bb75d2c5d02e96e
 2023-09-13 18:11:44 +00:00
Anvesh Renikindi
a5a031f98b [automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into aosp-main-future am: 7bed4aade8 -s ours am: d783537f9f -s ours 
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669

Change-Id: I12e36af194476868389e84fa9a07333652eb7d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 18:04:37 +00:00
Chaohui Wang
bc7f3e566d [automerger skipped] Remove ExperimentalLifecycleComposeApi am: 5d8fea06b1 -s ours am: 55a2fe7bd2 -s ours 
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669

Change-Id: I52060122d94ed44a42d52ee4ed04eea1204acc1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 18:04:30 +00:00
Randy Pfohl
057602c83a Merge "update navigation mode settings string" into udc-qpr-dev am: fa0371ae8f am: e66986f9ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24722205

Change-Id: Id1db26f3f0702f2df0a89ee921c124d2bc681673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 18:00:53 +00:00
Guojing Yuan
ac64ce5153 Merge "[CDM] Add Permissions Sync toggle" into main 2023-09-13 17:37:58 +00:00
Anvesh Renikindi
d783537f9f [automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into aosp-main-future am: 7bed4aade8 -s ours 
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669

Change-Id: Ie235b1f2607bed1091844eec8dbff696b2b38807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 17:16:30 +00:00
Chaohui Wang
55a2fe7bd2 [automerger skipped] Remove ExperimentalLifecycleComposeApi am: 5d8fea06b1 -s ours 
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669

Change-Id: I9fd1502569bbd84665220325471551b9661a6a43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 17:16:23 +00:00
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
Anvesh Renikindi
7bed4aade8 Merge "Remove ExperimentalLifecycleComposeApi" into aosp-main-future 2023-09-13 16:29:32 +00: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
67f2c30f07 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib02ff19237359ff7516ccb4845a5eaad943dfd21
 2023-09-13 03:59:47 -07: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
Bill Yi
460579f2b3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6fddeb232467d08ebf52854669b202641080f2f0
 2023-09-13 03:46:30 -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
Zaiyue Xue
e3232dac25 Call detect anomaly in battery usage period job 
Bug: 291689643
Bug: 284893240
Test: manual
Change-Id: I7015cdf5a96d518febb160934d780ae84fe14427
 2023-09-13 17:49:14 +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