Daniel Huang
e84a107b6e
Merge "Use ScrollView to include the full layout." into udc-dev am: 6e55a52559
am: b009dc72a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573537
Change-Id: Ie83451d71d522b5b5c462dad5a6141c749eea287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 03:01:28 +00:00
Treehugger Robot
bfbe9c834d
[automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1
am: 5d93cea1c7
-s ours am: 2f0557495d
-s ours am: d1267c1675
-s ours am: 30f5c10510
-s ours
...
am skip reason: skipped by user delphij
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528258
Change-Id: I62d0e589a8618b8b7d5150fbc09f7eea2bea239d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:55:04 +00:00
Treehugger Robot
844a2ff7de
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8e95c6e66a
-s ours am: dacb81d743
-s ours am: 3ae935bc1f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567289
Change-Id: I1d4a4a61ee36dfe46fa12dd1392db4d00f864870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:50:40 +00:00
Bill Yi
491c38bfb8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817fa66f8b
-s ours am: d145911bf1
-s ours am: 009f4b1ee3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567289
Change-Id: I443f9a8a3acdffcb1a9a15dcb4ffc40a4078c61d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:48:47 +00:00
TreeHugger Robot
83692baf4d
Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev am: 70ef00405c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573807
Change-Id: I44d88661d9eb68d745e7953df945236c965c10f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:48:13 +00:00
TreeHugger Robot
f2e7f45fe6
Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev am: 70ef00405c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573807
Change-Id: I8acb55c68dfa080548169dcbcc24b634aa2db297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:47:51 +00:00
Bill Yi
a3dfec6bb5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc0dc12fce
-s ours am: e5a98b540e
-s ours am: 9a1fe79b1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567288
Change-Id: If6e05e5476efbd3ebe0ae6316573b511ed01c63a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:43:38 +00:00
Hao Dong
59537d1834
Merge "Fix biometrics unicorn consent string bug." into udc-dev am: ad5954bc94
am: cc0d6acce1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22578994
Change-Id: I6b1584165e04ec492a488df2f612cd4cc8576f95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:42:58 +00:00
YK Hung
4be00b0766
Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev am: e4c3f68b56
am: 26b8b4c088
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573805
Change-Id: I106c05b244b603ecc7c9207253e7d94b2b942a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:41:03 +00:00
Treehugger Robot
9cc845069e
Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a
am: ff6def3c7c
am: 525b567db3
am: a7152b9573
am: c366b8381c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819
Change-Id: Idae38f76acb06007c70d860a505f45f0a479ca38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:32:24 +00:00
Marcelo Arteiro
52f43dfdf3
Merge "Fix for Check mark color on Regional preferences" into udc-dev am: cab738bf39
am: 379150e898
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573598
Change-Id: I2ffb6538b1f01e15af2dc0543d0c332f8ee7e280
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:32:11 +00:00
Vania Januar
4194cf1c5d
Merge "Add developer options to force enable Notes role." into udc-dev am: b79772ac3a
am: d673f304c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22459282
Change-Id: I4b8b35b932c158b9e98779e4486be82cffa5f1bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:29:42 +00:00
Automerger Merge Worker
218fa19f35
Merge "Merge "Fix App languages for work profile" into udc-dev am: 568ba14b9b
am: d250ee1a8b"
2023-04-13 02:29:37 +00:00
Bill Yi
4f095e6d23
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc0dc12fce
-s ours am: e5a98b540e
-s ours am: 4c6996b55c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567288
Change-Id: I132b41fb8abc7caf4d984b5de5a1ad5b3fbb0038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:26:52 +00:00
Treehugger Robot
87d90cc1c4
Merge "Fix App languages for work profile" into udc-dev am: 568ba14b9b
am: d250ee1a8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530839
Change-Id: I49b5265140364d99ac67867828a0efb97b7017c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:26:48 +00:00
Automerger Merge Worker
0677736292
Merge "Merge "Optimize screen time cross power connection logic from O(N^2) to O(N)" into udc-dev am: c00fb2efbd
am: 9e28310519"
2023-04-13 02:26:42 +00:00
YK Hung
c229716c6d
Merge "Optimize screen time cross power connection logic from O(N^2) to O(N)" into udc-dev am: c00fb2efbd
am: 9e28310519
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573802
Change-Id: Ibfb95f2e9dcf632da581bf045149d818a01b62f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:26:36 +00:00
Hao Dong
e382c39e38
Merge "Fix biometrics unicorn consent string bug." into udc-dev am: ad5954bc94
am: e5946f6858
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22578994
Change-Id: Ied41df2285a984d0cc9220244f7208acf40dca8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:26:15 +00:00
YK Hung
f4d44bcfff
Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev am: e4c3f68b56
am: 3c47574638
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573805
Change-Id: I8f7828fb51361ff560984b1de0320b234e7adb64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:26:04 +00:00
Treehugger Robot
e3c1bbf359
Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a
am: ff6def3c7c
am: 525b567db3
am: a7152b9573
am: 7bf829b4a6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819
Change-Id: Ica0b365494d5d14acfddeb84dd83b28e81b13e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:23:22 +00:00
Marcelo Arteiro
ba9e9abaa5
Merge "Fix for Check mark color on Regional preferences" into udc-dev am: cab738bf39
am: ad2457b1ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573598
Change-Id: I8afb28969ddcb6b45656e4a1f0a30bdd63b37fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:21:51 +00:00
Vania Januar
c7329bf42e
Merge "Add developer options to force enable Notes role." into udc-dev am: b79772ac3a
am: a24e7dc12a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22459282
Change-Id: I836cfd095b654ef4b55abb1474a19cd4ced4f1f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:20:27 +00:00
Treehugger Robot
b6f09d0f91
Merge "Fix App languages for work profile" into udc-dev am: 568ba14b9b
am: 5a88b6f2ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530839
Change-Id: I3c412e417aab68353affa987f73c579deea523c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:18:21 +00:00
YK Hung
cb1c18f1c6
Merge "Optimize screen time cross power connection logic from O(N^2) to O(N)" into udc-dev am: c00fb2efbd
am: d02dc7bf44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573802
Change-Id: Ie6be75840c35f2cba9a4c60041af91a8e56b09ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 02:18:06 +00:00
Suprabh Shukla
5aeef97cae
Handle corner cases in "Alarms and Reminders" page
...
There are few corner cases and new updates that need to be incorporated:
1. Apps that declare USE_EXACT_ALARM, do not need SCHEDULE_EXACT_ALARM.
So these should be filtered out, regardless of whather they declared
the latter.
2. Apps that are in the power allowlist do not need either of the
permission, and so these should be filtered out as well.
In either case, if the user somehow ends up in the app detail page for
this setting, the switch should get disabled based on existing logic.
Test: make -j RunSettingsRoboTests
Test: Manually by UI inspection:
Settings -> Apps -> Special App access -> Alarms and Reminders
or by running:
adb shell am start -a android.settings.REQUEST_SCHEDULE_EXACT_ALARM
Bug: 232460265
Change-Id: I5aeab49f95260218878bc36f5a4d73a49e5082e4
2023-04-12 19:17:57 -07:00
TreeHugger Robot
70ef00405c
Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev
2023-04-13 02:16:15 +00:00
David Liu
a4f9cb80eb
Merge "Merge "Update Settings owners list" am: 1a811a130a
am: ae70edc7f5
am: a6cd016e9a
am: 65136fa9f8
am: 9c86b7c1eb"
2023-04-13 02:11:08 +00:00
David Liu
4090ddf0c8
Merge "Merge "Update Settings owners list" am: 1a811a130a
am: ae70edc7f5
am: a6cd016e9a
am: 65136fa9f8
am: dd39b890a9"
2023-04-13 02:07:38 +00:00
Sunny Shao
049184fdec
Add a feature flag for SPA metrics
...
- Add a new SETTINGS_ENABLE_SPA_METRICS flag.
Bug: 277540990
Bug: 253979024
Test: atest SpaActivityTest SpaLogDataTest MetricsDataModelTest
Change-Id: Iba7a44715cf6ba78c3b84d559faf71a0be33d8d3
2023-04-13 02:02:34 +00:00
Daniel Huang
a52ac4eae7
Merge "Use ScrollView to include the full layout." into udc-dev am: 6e55a52559
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573537
Change-Id: Id2b7c87824c9083eed865a884740d02e483872f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 01:03:07 +00:00
Daniel Huang
b009dc72a3
Merge "Use ScrollView to include the full layout." into udc-dev am: 6e55a52559
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573537
Change-Id: Icb6eda297355ad036fb5496534392049bba76483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-13 01:03:03 +00:00
Daniel Huang
6e55a52559
Merge "Use ScrollView to include the full layout." into udc-dev
2023-04-13 00:41:45 +00:00
Treehugger Robot
30f5c10510
[automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1
am: 5d93cea1c7
-s ours am: 2f0557495d
-s ours am: d1267c1675
-s ours
...
am skip reason: skipped by user delphij
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528258
Change-Id: Ib0730278efa661553c3a7a11f6cbb085e3886e40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 21:13:23 +00:00
Treehugger Robot
35f746dade
[automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1
am: 5d93cea1c7
-s ours am: 2f0557495d
-s ours am: d1267c1675
-s ours
...
am skip reason: skipped by user delphij
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528258
Change-Id: I0aeadf6ca795d190aa3cffd41e2dfec30620a40d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 21:08:48 +00:00
Treehugger Robot
d1267c1675
[automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1
am: 5d93cea1c7
-s ours am: 2f0557495d
-s ours
...
am skip reason: skipped by user delphij
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528258
Change-Id: I748bb0da37a29aca390990332e5872deb256b16f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 20:57:11 +00:00
Treehugger Robot
2f0557495d
[automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1
am: 5d93cea1c7
-s ours
...
am skip reason: skipped by user delphij
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528258
Change-Id: Iff5558b9267a6282536f16601d67959e58c347d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 20:23:01 +00:00
David Liu
72ebcab7e9
Merge "Update Settings owners list" am: 1a811a130a
am: ae70edc7f5
am: a6cd016e9a
am: 65136fa9f8
am: 9c86b7c1eb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2531959
Change-Id: I54d52e4a8d781bbf76364f4077980fd9a9b08269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
BUG: 277883465
2023-04-12 20:19:32 +00:00
David Liu
8af079db60
Merge "Update Settings owners list" am: 1a811a130a
am: ae70edc7f5
am: a6cd016e9a
am: 65136fa9f8
am: dd39b890a9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2531959
Change-Id: Ib2394ee6cef1d8fffdce34d0e8a293a34a35de6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
Bug:277864768
2023-04-12 20:18:44 +00:00
Treehugger Robot
3ae935bc1f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8e95c6e66a
-s ours am: dacb81d743
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567289
Change-Id: I358e473fcfab1cf2ae14686efa59e7da6eaa50a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 20:17:51 +00:00
Bill Yi
009f4b1ee3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817fa66f8b
-s ours am: d145911bf1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567289
Change-Id: I49abc6aac58d8989d5984e8d91541f2968870535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 20:17:14 +00:00
Treehugger Robot
635c0e08ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8e95c6e66a
-s ours am: dacb81d743
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567289
Change-Id: I88ad49353eff47f0239be1aac51a363b652ab0c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 20:02:17 +00:00
Bill Yi
c3dfe52e8c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817fa66f8b
-s ours am: d145911bf1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567289
Change-Id: I74fc31cfde77ec3ed3c2e876c38f2667661bbd33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 20:01:54 +00:00
Lucas Silva
3b1c739ce2
Add intent for entering communal settings
...
This allows other apps to link to communal settings.
Fixes: 276742740
Test: adb shell am start -a android.settings.COMMUNAL_SETTINGS
Test: switched to secondary user, attempted to launch using command
above. Verified it didn't work
Change-Id: I5e845ecba58d8443d41aeea95bc6068a0041cac8
2023-04-12 20:01:14 +00:00
Treehugger Robot
dacb81d743
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8e95c6e66a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567289
Change-Id: I820a1cf4aa87dfc27dd707a5580cdb2bc77dda7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 19:48:15 +00:00
Bill Yi
d145911bf1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817fa66f8b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567289
Change-Id: Idd2d1235c08bc145d4570476875db69efc8d9843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 19:47:52 +00:00
Treehugger Robot
7afb2d4440
Merge "Remove unused MagnificationPreferenceFragment and its related controllers"
2023-04-12 19:33:30 +00:00
Bill Yi
9a1fe79b1a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc0dc12fce
-s ours am: e5a98b540e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567288
Change-Id: I3407f4ca3a464571d6523f94e84b0a92508d2be1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 19:20:10 +00:00
Bill Yi
4c6996b55c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc0dc12fce
-s ours am: e5a98b540e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567288
Change-Id: Ibdb7a90dd2e56fae76a269bf78479cc306e6177a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 19:05:43 +00:00
Bill Yi
e5a98b540e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc0dc12fce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22567288
Change-Id: I2624e36dfdad37be6f90c209d4ea96e5e1db7a01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 19:02:18 +00:00
Treehugger Robot
5d93cea1c7
Merge "Merge TQ2A.230405.003" am: fd8670a4c1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528258
Change-Id: I2ebe468438118d275db0ee38a0c0c624207bd771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 19:00:58 +00:00