PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,884 Commits 1 Branch 0 Tags
36dc648ca5e4f4714258f93aa470bdb03e09ce3f
Commit Graph

129884 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Graciela Wissen Putri
392a811294 Add accessible sequence for aspect ratio options 
Fix: 297293566
Test: Manual
Change-Id: I12b61ccd0330b80e027af7a9eb1693b8d94cc262
 2023-09-14 10:35:05 +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
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
Android Build Coastguard Worker
ec64c7a986 Snap for 10804332 from fa0371ae8f to udc-qpr1-release 
Change-Id: I5e355ce0be54f4b9021d48d2372e37ec2b5d9618
 2023-09-13 23:19:32 +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
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
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
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
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
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
YK Hung
8596b78a00 Merge "Refactor flags of Power Anomaly Tips in Settings Intelligence.(1/2)" into udc-qpr-dev am: 02b5491447 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24663389

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

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

Change-Id: I6aa86815837a7be5fc76273a121c4060a12f5b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 04:39:21 +00:00
YK Hung
9a293a7101 Merge "Refactor battery usage page contollers interaction logic" into udc-qpr-dev 2023-09-13 04:35:26 +00:00
YK Hung
02b5491447 Merge "Refactor flags of Power Anomaly Tips in Settings Intelligence.(1/2)" into udc-qpr-dev 2023-09-13 04:35:16 +00:00
YK Hung
378ad24aac Merge "Recheck the scedule job when the device is full charged and add more logs" into udc-qpr-dev 2023-09-13 04:24:04 +00:00
Treehugger Robot
7e92664f52 Merge "Save foreground_service and cached consumed power in battery usage slot datebase." into udc-qpr-dev 2023-09-13 04:11:20 +00:00
Zaiyue Xue
ea0f5b3d45 Refactor battery usage page contollers interaction logic 
(1) Move controllers interaction logic from BatteryChartPreferenceController to main page PowerUsageAdvanced.
(2) Move query power anomaly logic to DataProcessManager async job.

Bug: 284893240
Test: manual
Change-Id: Ib23b338fe3946e68ff73a372342ec5d86494c566
Merged-In: Ib23b338fe3946e68ff73a372342ec5d86494c566
 2023-09-13 03:56:28 +00:00
Android Build Coastguard Worker
ccf67c4481 Snap for 10797983 from 951bbde355 to udc-qpr1-release 
Change-Id: I2db26edd77cbea3bfe4b9413d066440c67c8e5cc
 2023-09-12 23:19:42 +00:00