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

135692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bill Yi
d48c063052 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8d9b3ba011e9d6bb212e4c4082c5047c2e9a0f8f
 2023-09-13 10:45:41 -07:00
Guojing Yuan
ac64ce5153 Merge "[CDM] Add Permissions Sync toggle" into main 2023-09-13 17:37:58 +00:00
Bill Yi
c8093f1307 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6e3f48d1ceefc9954b90aa81b22286fbd22d4486
 2023-09-13 10:32:14 -07:00
Bill Yi
4f1071b5c3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9308c7543765f43bf431a21fabed4cdeeee3fb14
 2023-09-13 10:26:42 -07: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
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
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
Elliot Sisteron
8744e021e5 Handle "Blocked by your IT admin" better. 
Instead of allowing the user to click the entry, make the entry
non-clickable and mention that it's blocked by IT admin.

Bug: 297965563
Test: atest LockScreenSafetySourceTest
Change-Id: I821d661dd924358a5e7b033118b63e104ade9eaf
 2023-09-13 14:02:41 +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
3a0fbff331 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic599e0023783587dfd9156db04d6dfc356b8a383
 2023-09-13 03:59:01 -07:00
Bill Yi
8d26a94857 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8636c4e0eea8d1117e619c89be47fd1a4d306ed1
 2023-09-13 03:58:12 -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
3cedcebd1e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I038a4b2bbe0865323f92a6dd6f3403931c19f387
 2023-09-13 03:53:57 -07:00
Bill Yi
f5753866bb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2329e79de417f12e41ce0038bdddf2b2146b53cf
 2023-09-13 03:52:22 -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
f75591fa73 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I49d3e0cd1a1823b7dc4f0030622c3a9e4482983c
 2023-09-13 03:50:11 -07:00
Bill Yi
883a2b633e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I40cee892bda141e4c3da8f593418408a9c94445e
 2023-09-13 03:49:23 -07:00
Bill Yi
283a8d5d40 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5b123a272062752471f1b9c9d80bf4dbaf0061ca
 2023-09-13 03:47:54 -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
Milton Wu
867df4287f [BiometricsV2] Ignore ui tests 
Ignore biometricsV2 UI tests

Bug: 299892647
Bug: 299894420
Bug: 299892667
Bug: 299892703
Bug: 299898688
Test: atest FingerprintEnrollmentActivityTest
Change-Id: If7aa509dbc0943aa53ffcc9d118ecc19e59b127f
 2023-09-13 08:37:44 +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
Manish Singh
5aef6b6264 Remove temp workaround for feature flag 
Using the trunk stable feature flagging now.

Bug: 295516544
Test: m
Test: manual adb
Test: atest SafetySourceBroadcastReceiverTest
Test: atest PrivateSpaceSafetySourceTest
Change-Id: I3d2d8c11dfb224ad2b09572493633366b4c4805c
 2023-09-13 08:49:56 +01:00
Charlotte Lu
8ac60b5237 Add flag to change to the new APN page. 
Fix: 300203760

Test: Visual
Change-Id: I0f869fb847f0a108487eb84509a736129fe42223
 2023-09-13 07:15:35 +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
YK Hung
7f028b684c [automerger skipped] Merge "Refactor battery usage page contollers interaction logic" into udc-qpr-dev am: 9a293a7101 am: 9feaa3d883 -s ours 
am skip reason: Merged-In Ib23b338fe3946e68ff73a372342ec5d86494c566 with SHA-1 f5ea50e20e is already in history

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

Change-Id: I760578371e55bc5ef8fe3291df20fe941026551a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 05:36:22 +00:00
YK Hung
0cb800a4d6 [automerger skipped] Merge "Refactor flags of Power Anomaly Tips in Settings Intelligence.(1/2)" into udc-qpr-dev am: 02b5491447 am: 8596b78a00 -s ours 
am skip reason: Merged-In I826f517aa61e0c970048164706c4512ac3e0472d with SHA-1 2c0242bed3 is already in history

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

Change-Id: Ibf4a75d16a7c9e395f932cf194c697186e10bfcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 05:34:55 +00:00
YK Hung
abc3ed4c88 Merge "Recheck the scedule job when the device is full charged and add more logs" into udc-qpr-dev am: 378ad24aac am: 348b3b91d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24673967

Change-Id: I6d29fc6eec107000986ad154bb8bc3bf81722b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 05:33:15 +00:00
Treehugger Robot
3de1603336 Merge "Save foreground_service and cached consumed power in battery usage slot datebase." into udc-qpr-dev am: 7e92664f52 am: aab57c0179 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24689853

Change-Id: I2d7fd99406b999f5a027eefed61be22da293475e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 05:30:51 +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
YK Hung
9feaa3d883 Merge "Refactor battery usage page contollers interaction logic" into udc-qpr-dev am: 9a293a7101 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24545857

Change-Id: I29faff65657c84156d21d8e2bfc6ea285dbd5f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 04:45:21 +00:00