Kuan Wang
a79edc3b56
Merge "Replaces getBatteryHistoryUri and getBatteryHistorySinceLastFullCharge with the new functions in DatabaseUtils."
2022-11-01 07:11:04 +00:00
Angela Wang
c4f3295491
Fix should not let users adjust a11y button settings in SuW issue
...
Root Cause: Users should not be able to adjust any settings of the a11y
button in the setup wizard flow, but there will be a link button to
a11y button settings page on the a11y tutorial dialog where user can
modify the settings.
Solution: Hide the link button in a11y tutorial dialog if we know the
dialog is launched from any setup wizard page.
Bug: 256084341
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityGestureNavigationTutorialTest
Change-Id: I742f9b7ba311fcd7a5105463709dc104345b9f12
2022-11-01 07:07:47 +00:00
Kuan Wang
45be6bae05
Listen ACTION_BATTERY_LEVEL_CHANGED in Settings and fetch usage data
...
when battery is full charged.
Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: Ie83e5f319074ff404a600c4eb375fbecad651b6d
2022-11-01 06:39:21 +00:00
Chaohui Wang
7ef1fb7ef5
Merge "Add InteractAcrossProfilesDetailsPreference for Spa"
2022-11-01 06:08:17 +00:00
Joshua Mccloskey
087a7d29f4
Merge "Implement SFPS “require screen on to auth”"
2022-11-01 04:55:05 +00:00
Arc Wang
10d4535e2b
[automerger skipped] [Activity embedding] Fix unexpected finished 2nd layer problem am: 9e207bfcd0
am: 67dc170d66
-s ours
...
am skip reason: Merged-In I262327cc49c3a4434a183eb00ac57f47fa598f70 with SHA-1 31eec49217
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20309891
Change-Id: I3834777b3e02f539f7cd078d92c9cbe4d08e75bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 03:26:46 +00:00
Arc Wang
67dc170d66
[Activity embedding] Fix unexpected finished 2nd layer problem am: 9e207bfcd0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20309891
Change-Id: I0ed23ce19ce4dca5308ecae20e891f4476738258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 02:54:36 +00:00
Kuan Wang
c5c87b7774
Replaces getBatteryHistoryUri and getBatteryHistorySinceLastFullCharge
...
with the new functions in DatabaseUtils.
Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: I5f60cef80d1e9ba3f87ab6f84492463152a40276
2022-11-01 02:06:57 +00:00
Kuan Wang
df05a1378b
Add hourly period job to fetch battery usage data in Settings.
...
Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: I342066a30fed202e5013b8c2554f36d991975c3e
2022-11-01 02:05:14 +00:00
Bonian Chen
887152470e
[Settings] configuration for hidding SIM notification UI
...
Hide SIM notification UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Change-Id: I7a912a3393694155d29614d325796e08598985bf
2022-11-01 01:56:55 +00:00
Treehugger Robot
9040efdccc
Merge "Fix errorprone warnings that should be errors" am: 5744d7c560
am: 7094507528
am: 778ef161bb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255054
Change-Id: I1f3cbce7d5de6e63477bc2da2ad115ec53b06472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 00:02:10 +00:00
Treehugger Robot
778ef161bb
Merge "Fix errorprone warnings that should be errors" am: 5744d7c560
am: 7094507528
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255054
Change-Id: I369fd8dc4e2cec46ffd4e61a32e7e55cb11b41a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 23:24:11 +00:00
Treehugger Robot
7094507528
Merge "Fix errorprone warnings that should be errors" am: 5744d7c560
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255054
Change-Id: I65ce6c4fdedd32ff6feb4b5e210b508aafc4e589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 22:57:02 +00:00
Treehugger Robot
5744d7c560
Merge "Fix errorprone warnings that should be errors"
2022-10-31 22:21:12 +00:00
TreeHugger Robot
425b87090f
Merge "Request hiding IME before starting next activity transition"
2022-10-31 20:30:58 +00:00
Kweku Adams
39c9441bea
Merge "Allow modifying minimum consumption limit."
2022-10-31 18:54:23 +00:00
Bonian Chen
d2569ff16b
[automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM related UI" into tm-qpr-dev-plus-aosp am: 525529c137
-s ours
...
am skip reason: Merged-In I8d7ddd18861a696830da39f040dfb14b9ed46726 with SHA-1 5dae24208b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271788
Change-Id: I6fe8b0179a7432ef93af9f48fe4ee7758559dbee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:56 +00:00
Bonian Chen
5cb0b4b8f4
[automerger skipped] [Settings][Back port] configuration for hidding SIM related UI am: 2b048b22f0
-s ours
...
am skip reason: Merged-In I8d7ddd18861a696830da39f040dfb14b9ed46726 with SHA-1 5dae24208b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271788
Change-Id: Ic2fc1dda8cba05e7da18519883bd0af0c3e24b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:55 +00:00
Bonian Chen
6e5d5f05db
[automerger skipped] Merge "[Settings] configuration for hidding SIM notification UI" into tm-qpr-dev-plus-aosp am: e3b5bda8aa
-s ours
...
am skip reason: Merged-In I07d9ddeb96ca590decf28126ce97fba4c1783304 with SHA-1 504e71c284
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271787
Change-Id: Ifa6481c3debe82a9e3482fc6373276cc9f184437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:53 +00:00
Bonian Chen
90b7ff7df2
[automerger skipped] [Settings] configuration for hidding SIM notification UI am: 02e4807229
-s ours
...
am skip reason: Merged-In I07d9ddeb96ca590decf28126ce97fba4c1783304 with SHA-1 504e71c284
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271787
Change-Id: Ifb7b079e1ab1bc57d784868d4199d9a51bf7fbc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:52 +00:00
Bonian Chen
5382450ebe
[automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM remove UI" into tm-qpr-dev-plus-aosp am: f192a07988
-s ours
...
am skip reason: Merged-In Iea40b89733cc75a41f960fecb2ac24177a4cbd3d with SHA-1 69f6e76f2c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271786
Change-Id: If11e77224cc97a0ed613e7b2be677fe8ca6c05df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:50 +00:00
Bonian Chen
79a29e9f3e
[automerger skipped] [Settings][Back port] configuration for hidding SIM remove UI am: f6114d3f83
-s ours
...
am skip reason: Merged-In Iea40b89733cc75a41f960fecb2ac24177a4cbd3d with SHA-1 69f6e76f2c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271786
Change-Id: I25c41e551b303ca514b0888a0a0699ada4346d72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:49 +00:00
Bonian Chen
7f8204647a
[automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM settings UI" into tm-qpr-dev-plus-aosp am: c5bd2f425b
-s ours
...
am skip reason: Merged-In If1df99a79e51125d03f534cdfc9408b01c61024f with SHA-1 5bcfa284a9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20265100
Change-Id: Ibe612d82b030b1d142568dd4e0724d8e0a8bd96a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:47 +00:00
Bonian Chen
aba72c0814
[automerger skipped] [Settings][Back port] configuration for hidding SIM settings UI am: b4a8672dd9
-s ours
...
am skip reason: Merged-In If1df99a79e51125d03f534cdfc9408b01c61024f with SHA-1 5bcfa284a9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20265100
Change-Id: I06f60f2622f473c00d32946a298258f0fdf2dfa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:46 +00:00
Bonian Chen
6124464d58
[automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev-plus-aosp am: 4c06b549bf
-s ours
...
am skip reason: Merged-In I870c0b53112db56b7bc80bfd585f6f7b3cf82737 with SHA-1 7c3f04aa11
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20265099
Change-Id: I17fa1fca8a8fcc121cf2d4cc6a222b1f969f8a24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:44 +00:00
Bonian Chen
b1cd705f5d
[automerger skipped] [Settings][Back port] configuration for hidding SIM lock UI am: 0466417c76
-s ours
...
am skip reason: Merged-In I870c0b53112db56b7bc80bfd585f6f7b3cf82737 with SHA-1 7c3f04aa11
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20265099
Change-Id: Ia4449eda9e6c30d19bbad240c617ea575ab9d401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:43 +00:00
Bonian Chen
f5f55e21a0
[automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM provider UI" into tm-qpr-dev-plus-aosp am: a81f71ae46
-s ours
...
am skip reason: Merged-In I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b with SHA-1 2f07595eb0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20265098
Change-Id: I8d63ec792086c5c10a9b223fca2d7311ba46c7c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:39 +00:00
Bonian Chen
97de5d4beb
[automerger skipped] [Settings][Back port] configuration for hidding SIM provider UI am: 95dc65667e
-s ours
...
am skip reason: Merged-In I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b with SHA-1 2f07595eb0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20265098
Change-Id: I7754e1b8dd88c972a79f3a3f3a342790fd7f96ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 17:00:33 +00:00
Bonian Chen
525529c137
Merge "[Settings][Back port] configuration for hidding SIM related UI" into tm-qpr-dev-plus-aosp
2022-10-31 15:49:21 +00:00
Bonian Chen
e3b5bda8aa
Merge "[Settings] configuration for hidding SIM notification UI" into tm-qpr-dev-plus-aosp
2022-10-31 15:49:21 +00:00
Bonian Chen
f192a07988
Merge "[Settings][Back port] configuration for hidding SIM remove UI" into tm-qpr-dev-plus-aosp
2022-10-31 15:49:21 +00:00
Bonian Chen
c5bd2f425b
Merge "[Settings][Back port] configuration for hidding SIM settings UI" into tm-qpr-dev-plus-aosp
2022-10-31 15:49:21 +00:00
Bonian Chen
4c06b549bf
Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev-plus-aosp
2022-10-31 15:49:21 +00:00
Bonian Chen
a81f71ae46
Merge "[Settings][Back port] configuration for hidding SIM provider UI" into tm-qpr-dev-plus-aosp
2022-10-31 15:49:21 +00:00
YK Hung
c91d3fa880
Merge "Add Zaiyue and I as the owners of battery usage."
2022-10-31 14:49:02 +00:00
Kweku Adams
f6f9a4b7b2
Allow modifying minimum consumption limit.
...
Create separate fields for minimum and initial consumption limits so
that they can be modified independently.
Bug: 255321890
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/tare
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/tare
Test: manually change in Developer Options UI
Change-Id: I82c146a18b54a18313de590038f2f807a2310aa0
2022-10-31 14:20:58 +00:00
Arc Wang
9e207bfcd0
[Activity embedding] Fix unexpected finished 2nd layer problem
...
If Settings is started on an existing task, the existing SplitPairRule
may cause an unexpected app finish while navigating back from the
2nd layer page.
This change resets SplitPairRule in onNewIntent().
Bug: 247080168
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsHomepageActivityTest
manual
1. Settings app -> 'Connexted device'.
2. Launch Settings app again from Settings icon in quick Settings.
3. Start a 3rd layer from 'Network & internet'
4. Click back and see if the 2nd lay shows.
Change-Id: I262327cc49c3a4434a183eb00ac57f47fa598f70
Merged-In: I262327cc49c3a4434a183eb00ac57f47fa598f70
2022-10-31 21:33:02 +08:00
Bonian Chen
bda2f43f7b
Merge "[Settings] Adjust the finish procedure when launching Settings UI"
2022-10-31 11:38:25 +00:00
Chaohui Wang
49b7ebeb23
Add InteractAcrossProfilesDetailsPreference for Spa
...
To try:
1. adb shell am start -n com.android.settings/.spa.SpaActivity
2. Go to Apps -> All apps -> [One App] -> Connected work & personal apps
Bug: 236346018
Test: Unit test & Manual with Settings App
Change-Id: I4145ffdb46da6e0c4b7b5103207e7b75a8bbfb6a
2022-10-31 19:25:48 +08:00
TreeHugger Robot
7ced3c187d
Merge "Use correct menu key highlights for safety center" into tm-qpr-dev am: b0f38d29d2
am: dada288047
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20209766
Change-Id: Ie4bec451717442032411cad912810cbfd7a69baa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 11:24:47 +00:00
Chaohui Wang
1e45e38c02
Merge "Add AppAllServicesPreference for Spa"
2022-10-31 11:18:43 +00:00
Arc Wang
c932da4b79
Fix Storage Settings summary jank
...
When switching dark theme, Settings homepage is re-created
and storage summary will be calculated in worker thread and
then be displayed after a short time.
Use cache to display the summary before latest summary is available.
Bug: 255459774
Test: manual visual
Switch Dark theme and observe Storage settings summary.
Change-Id: I88c7190758a8bdf3a1a24137b9638ca3fb839887
2022-10-31 10:58:44 +00:00
TreeHugger Robot
dada288047
Merge "Use correct menu key highlights for safety center" into tm-qpr-dev am: b0f38d29d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20209766
Change-Id: I33446534e0f76df00fe3e5fad0e8ac135afafc5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 10:54:00 +00:00
Kuan Wang
68670cd883
Add Zaiyue and I as the owners of battery usage.
...
Test: NA
Change-Id: If768f53a11df687974706346157b75d5cce14a0e
2022-10-31 10:26:50 +00:00
TreeHugger Robot
b0f38d29d2
Merge "Use correct menu key highlights for safety center" into tm-qpr-dev
2022-10-31 10:04:02 +00:00
TreeHugger Robot
88313aed6c
Merge "Fix the bluetooth extra control slice not visible" into tm-qpr-dev am: 3cb39ca221
am: 3ed6cb001b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20252603
Change-Id: Ic52873bd9940c0c8e60ab14bd617838c27d92916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 09:27:59 +00:00
TreeHugger Robot
bb17108f72
Merge "Remove "Hotspot" key from settings search if not needed" into tm-qpr-dev am: 58292e7058
am: 155beb0610
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20307409
Change-Id: I08bf5d2cdbd4a1e038af7c54468d39590f72e7c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 09:27:40 +00:00
Weng Su
950837b20f
Disallow screenshot on Wi-Fi QR code settings
...
- Add FLAG_SECURE to WifiDppConfiguratorActivity to avoid screenshot security issue
Bug: 249980936
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDppConfiguratorActivityTest
Change-Id: I5e62c2584122f79127ab505e8491565e163de296
2022-10-31 08:59:40 +00:00
TreeHugger Robot
3ed6cb001b
Merge "Fix the bluetooth extra control slice not visible" into tm-qpr-dev am: 3cb39ca221
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20252603
Change-Id: I78447f80bd4971eeb67395107a3731ccbcc18f63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 08:53:45 +00:00
TreeHugger Robot
155beb0610
Merge "Remove "Hotspot" key from settings search if not needed" into tm-qpr-dev am: 58292e7058
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20307409
Change-Id: I87b186f17e8126638d5d09d6e9970b590d12ff6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-31 08:51:31 +00:00