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
Treehugger Robot
8e95c6e66a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-04-12 18:38:34 +00:00
Hao Dong
cc0d6acce1
Merge "Fix biometrics unicorn consent string bug." into udc-dev am: ad5954bc94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22578994
Change-Id: Ibc09759d1c9e30380e2f144fb425b8be92e191be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 18:36:00 +00:00
Hao Dong
e5946f6858
Merge "Fix biometrics unicorn consent string bug." into udc-dev am: ad5954bc94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22578994
Change-Id: I8e08c8cb75e1ae7c794be59081b12c48a79f0735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 18:30:51 +00:00
Hao Dong
ad5954bc94
Merge "Fix biometrics unicorn consent string bug." into udc-dev
2023-04-12 18:02:16 +00:00
Treehugger Robot
fd8670a4c1
Merge "Merge TQ2A.230405.003"
2023-04-12 17:22:25 +00:00
ykhung
836dc0d76c
Remove plug/unplug condition for the incompatible charging
...
Remove the plug/unplug condition checking for the incompatible
notification based on the feedback from:
https://b.corp.google.com/issues/276403405#comment3
Bug: 276403405
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.batterytip"
Change-Id: Iec177ed33a3cc8cf5a5747b6f65440d31120823c
2023-04-13 00:29:11 +08:00
YK Hung
26b8b4c088
Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev am: e4c3f68b56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573805
Change-Id: I237ffcc54e6833e55feb85078e5c5df6629f2718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 16:11:34 +00:00
YK Hung
3c47574638
Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev am: e4c3f68b56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573805
Change-Id: I75cc6c46eaa0fdb5436a600ccd70d851417e2c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 16:11:29 +00:00
YK Hung
e4c3f68b56
Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev
2023-04-12 15:43:48 +00:00
Sunny Shao
b0885a155a
Add a feature flag for SPA metrics
...
- Add a new SETTINGS_ENABLE_SPA_METRICS flag.
Fixes: 277540990
Bug: 253979024
Test: atest SpaActivityTest SpaLogDataTest MetricsDataModelTest
Change-Id: I6da801691fd34fd133ec25d3a45ed6124bec51a1
Merged-In: Iba7a44715cf6ba78c3b84d559faf71a0be33d8d3
2023-04-12 21:38:40 +08:00
Treehugger Robot
2421846dc1
Merge "[BiometricsV2] IconTouchDialog continue enroll" into udc-dev am: eb3e62f639
am: 120dea4cf6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22552762
Change-Id: Ieb773c8586317c868deaeccdbfffbf5e68027be7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 11:52:17 +00:00
SongFerngWang
4c206e1a11
Fix the IndexOutOfBoundsException
...
Bug: 276460284
Test: build pass
Change-Id: If70bd4624b9b94aafa0930f0deba106cff5a2212
2023-04-12 19:50:51 +08:00
Treehugger Robot
c58f9ad608
Merge "Fix empty icon while tapping Auto-rotate screen widget" into udc-dev am: 104e412077
am: fc8eefe521
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569799
Change-Id: Ia70ec9d50c536d186c3fa47e5d46ab47e81e1538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 11:42:34 +00:00
YK Hung
3529a1708f
Merge "Draw vertical dividers with different colors if it has a timestamp label" into udc-dev am: c89b8e6d78
am: 65f1cf5f6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525849
Change-Id: I6e130e7d049dfcdb9357d8f4451d14f4968e4152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 11:41:09 +00:00
Chris Antol
b247380daf
Merge "Make Tips & Support page launchable from Settings Search results" into udc-dev am: 5336f758d2
am: 8780cc2711
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22579945
Change-Id: Ib67567d558a7cc7aae162169e7795a00c78802c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 11:37:20 +00:00
Quang Luong
d1a817fd4e
Merge "Don't overwrite security params when editing saved config" into udc-dev am: ba74d65523
am: 66e88d7802
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22439593
Change-Id: I695c3be4fb232378da19ee6a7afb7d86efdfec06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 11:34:41 +00:00
Marcello Galhardo
39cdff5066
Merge "Add Note Task Shortcut to Settings" into udc-dev am: 211b544ea8
am: 44a2cf0d2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252424
Change-Id: I408989611212acb1386edb623cd7354b07189603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 11:31:13 +00:00
Treehugger Robot
8745d8ea1f
Merge "[Panlingual] set direction and textAlignment for the locale dialog" into udc-dev am: ef65b4c580
am: af0bce92de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22572956
Change-Id: I3f54da8bccda89d28384cc8dbcbe7b3ad40192d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 11:24:35 +00:00
Treehugger Robot
7bf829b4a6
Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a
am: ff6def3c7c
am: 525b567db3
am: a7152b9573
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819
Change-Id: I4ff3013a2cfe2f8839f542383333a8de3b40e3ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 11:23:54 +00:00
Treehugger Robot
423bfef9c8
Merge "[Regional Pref] Add footer in Regional preference page" into udc-dev am: d81b473fe0
am: 672d1ce1fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22550313
Change-Id: Iaf33fe3131d7941bc87f8ee896cd5ba3be5a6c83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 11:17:14 +00:00
Daniel Huang
174c1faf4e
Merge "The dialog should persist after rotation." into udc-dev am: 74042f59de
am: fab7adefc3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568598
Change-Id: Id08f323bb94914749cdecb34f376367ac3a9567d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 11:16:06 +00:00