Wesley Wang
eda172ce2c
Fix app battery usage list launch incorrect works app
...
- App usage page only use package name to launch the page, it can not
identify the different userId between normal app and work profile
app, add extra userId info into launch args
- Remove no battery usage state/string if usage time is empty
Bug: 251471047
Test: make SettingsRoboTests
Change-Id: Id06ebb0f0fcd863e423acd7839f89bc0ae2444c1
2022-11-03 11:32:30 +00:00
Shaowei Shen
dba9928a7e
Merge "[Sound Panel] Set inset for button background" into tm-qpr-dev am: 7ebdcf7b14
am: bae059a834
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20288323
Change-Id: I76a7f481afc0cc3b2e8ec035ac6442ad5fb78545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-03 03:30:36 +00:00
Joshua Mccloskey
83307c935e
[automerger skipped] Merge "Implement SFPS “require screen on to auth”" into tm-qpr-dev am: db266ca6b2
am: 4033cc7d0e
-s ours
...
am skip reason: Merged-In Ia44604b059c4847c40608419b2e16219976ced3e with SHA-1 73bf45ee4b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20215190
Change-Id: Ia988b3cd1f05732c5a76be35503b11c3c14de84a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-03 03:07:39 +00:00
Shaowei Shen
bae059a834
Merge "[Sound Panel] Set inset for button background" into tm-qpr-dev am: 7ebdcf7b14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20288323
Change-Id: Ie07cd8e98461f59d1b9541591ee6f638f8579661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-03 02:42:26 +00:00
Joshua Mccloskey
4033cc7d0e
Merge "Implement SFPS “require screen on to auth”" into tm-qpr-dev am: db266ca6b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20215190
Change-Id: I7f485c93b429fc2d2f75b1fc3e46d82a47e31c25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-03 02:39:08 +00:00
Shaowei Shen
7ebdcf7b14
Merge "[Sound Panel] Set inset for button background" into tm-qpr-dev
2022-11-03 02:18:52 +00:00
Joshua Mccloskey
db266ca6b2
Merge "Implement SFPS “require screen on to auth”" into tm-qpr-dev
2022-11-03 01:56:52 +00:00
Grace Cheng
13d3bdc4c0
Implement SFPS “require screen on to auth”
...
Creates new setting on SFPS to require screen on before unlocking a
device. Also sets up toggles for this setting at the end of fingerprint
enrollment and on the fingerprint settings page, and adds tests to
verify expected behavior.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintSettingsRequireScreenOnToAuthPreferenceControllerTest
Fixes: 249169615
Fixes: 245343077
Fixes: 248530806
Change-Id: Id588796426d071860b3cc2af9ec5798c0027c202
Merged-In: Ia44604b059c4847c40608419b2e16219976ced3e
2022-11-02 14:34:59 +00:00
Joshua Mccloskey
1cda0a8418
Merge "Revert^2 "Implement SFPS “require screen on to auth”""
2022-11-02 14:33:18 +00:00
Arc Wang
9f10021cd2
Merge "Remove Intent selector from 2-pane deep link Intent"
2022-11-02 12:13:36 +00:00
TreeHugger Robot
f1aa26be3d
Merge "App language migration"
2022-11-02 10:17:03 +00:00
Arc Wang
12d4b78473
Merge "Extend SearchView width" into tm-qpr-dev am: 049deec9b5
am: 4cfe8b8204
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20337665
Change-Id: I7a3bdcfa520fe402da940e426a89b3ffd2c2b1e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-02 08:41:11 +00:00
Arc Wang
e9fe1b848d
Merge "Fix Storage Settings summary jank"
2022-11-02 08:18:33 +00:00
Arc Wang
4cfe8b8204
Merge "Extend SearchView width" into tm-qpr-dev am: 049deec9b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20337665
Change-Id: I2f7807561257dc18be802f0acc90cce56ca71b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-02 08:07:13 +00:00
Arc Wang
3b1587d6b2
Remove Intent selector from 2-pane deep link Intent
...
To guard against the arbitrary Intent injection through Selector.
Bug: 246300272
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsActivityTest
Change-Id: I8b3b936de490f09f4be960fdafc6e66a1d858ee2
2022-11-02 07:37:45 +00:00
Arc Wang
049deec9b5
Merge "Extend SearchView width" into tm-qpr-dev
2022-11-02 07:22:13 +00:00
Xuanang Zhao
0cc0149f18
Fix an untranslated text in the settings shortcut
...
Test: manual
Change-Id: I6211d2e7d14386771e85291b79c8140a320fd5ba
2022-11-02 13:55:21 +08:00
Mill Chen
0ee710cddd
App language migration
...
Implement current app language page using spa arch.
Bug: 236346018
Test: manual test with Settings app
Change-Id: I3d3c97304a381acec9d9ef0c27bd047a40ffc4a8
2022-11-02 13:29:15 +08:00
TreeHugger Robot
bcd7e55ffa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 9e3d69188f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308751
Change-Id: Iaed50871fba41c290a050f2e4ded6ede45b6fc42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-02 00:49:36 +00:00
TreeHugger Robot
8b23aa2c16
Merge "Disallow screenshot on Wi-Fi QR code settings" into tm-qpr-dev am: d2635580fb
am: 34471a7160
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20309947
Change-Id: I27396019f31117f69f9088174ed52c6ce3526556
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-02 00:35:02 +00:00
TreeHugger Robot
9e3d69188f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-11-02 00:09:27 +00:00
TreeHugger Robot
0c688c9e7c
Merge changes from topic "tc_change_22102807_16"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4f45cf9218
Import translations. DO NOT MERGE ANYWHERE
2022-11-02 00:09:27 +00:00
TreeHugger Robot
9289b73a87
Merge changes from topic "tc_change_22102807_16"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: da6968cf02
Import translations. DO NOT MERGE ANYWHERE
2022-11-02 00:09:27 +00:00
TreeHugger Robot
34471a7160
Merge "Disallow screenshot on Wi-Fi QR code settings" into tm-qpr-dev am: d2635580fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20309947
Change-Id: Id9e378514d71beef1a4dcb9ab0c96053dabe254f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-02 00:03:28 +00:00
TreeHugger Robot
d2635580fb
Merge "Disallow screenshot on Wi-Fi QR code settings" into tm-qpr-dev
2022-11-01 23:21:35 +00:00
Joshua Mccloskey
73bf45ee4b
Revert^2 "Implement SFPS “require screen on to auth”"
...
e62d37bad6
Change-Id: Ia44604b059c4847c40608419b2e16219976ced3e
2022-11-01 16:45:31 +00:00
TreeHugger Robot
71b556ed0d
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-11-01 16:37:52 +00:00
TreeHugger Robot
ac95c4363a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-11-01 16:37:52 +00:00
Bill Yi
84eb33a039
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1fa98709be
-s ours am: 4335d93892
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308767
Change-Id: I40cb80edcc05e7f1018bb80e4fae8c76a1fc25e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 15:41:55 +00:00
Bill Yi
eee2a78531
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4782603e13
-s ours am: 11b74c81fb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308767
Change-Id: I58b9b06670c1d583c3aa741f5480c243e4c2e88d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 15:41:47 +00:00
Bill Yi
882dce18b1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6f153936fd
-s ours am: d67c9cae5b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308754
Change-Id: Ibbd3b9429d88299fd7de83cc5a73c8ebfd235395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 15:41:35 +00:00
Bill Yi
7c23ff546b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c959a23a41
-s ours am: 436cfce33f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308754
Change-Id: Ie8b086591dc13e172e741775c20ac51d5b1fa798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 15:41:22 +00:00
Gil Cukierman
a69fc1784c
Merge "Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController" am: 08d03390ae
am: 27217b87a9
am: 58d85e3383
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229917
Change-Id: Ieb4b28cde2ec4b747ac55e57f4908c1cbf4ce340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 15:38:21 +00:00
Bill Yi
4335d93892
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1fa98709be
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308767
Change-Id: I31e950b25b477b81ed5d510597b06bd335dd3054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 15:10:47 +00:00
Bill Yi
11b74c81fb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4782603e13
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308767
Change-Id: I60a0830bb1cfc8caff841c19105202bdfd83c602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 15:10:30 +00:00
Bill Yi
d67c9cae5b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6f153936fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308754
Change-Id: I6d918b4a236691ef4e3aafd344fcdcf38222def4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 15:10:16 +00:00
Bill Yi
436cfce33f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c959a23a41
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308754
Change-Id: I45dbc6d0a51e14394f8a1cd8651c9412e73900ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 15:10:01 +00:00
Gil Cukierman
58d85e3383
Merge "Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController" am: 08d03390ae
am: 27217b87a9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229917
Change-Id: I5b61fd4c84e9ea881f786355c9649bd744d46ec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 15:02:30 +00:00
Bill Yi
1fa98709be
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-11-01 14:40:15 +00:00
Bill Yi
6f153936fd
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-11-01 14:40:15 +00:00
Gil Cukierman
27217b87a9
Merge "Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController" am: 08d03390ae
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229917
Change-Id: I17e4dc0b5dfdfd55a866b641af560b4dccba1296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 14:21:52 +00:00
Gil Cukierman
08d03390ae
Merge "Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController"
2022-11-01 13:51:58 +00:00
Michał Brzeziński
8205d3d591
Merge "Revert "Implement SFPS “require screen on to auth”""
2022-11-01 13:36:11 +00:00
Michał Brzeziński
e62d37bad6
Revert "Implement SFPS “require screen on to auth”"
...
Revert submission 20298870-cherrypick-require-screen-on-to-auth-bx2kw8azs3
Reason for revert: broken KeyguardUpdateMonitorTest
Bug: 256762678
Reverted Changes:
Id58879642:Implement SFPS “require screen on to auth”
Ibc55dfa66:Implement SFPS “require screen on to auth”
Change-Id: I772f6a1b3fa366bc10b200f365df79417eceb8ef
2022-11-01 11:28:30 +00:00
Arc Wang
0243771025
Extend SearchView width
...
To align SearchView x button with right border.
Bug: 254403811
Test: manual,
Settings > Apps > See all apps > tap the search icon >
input something and observe.
Change-Id: I5146c9ffb3c5177926e75f673497408092f6c065
2022-11-01 10:26:17 +00:00
Angela Wang
bd25f4a303
Merge "Fix should not let users adjust a11y button settings in SuW issue"
2022-11-01 09:25:46 +00:00
Kuan Wang
628f12c1ad
Remove isChartGraphEnabled() which should always return true after
...
migration.
Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: I0c4a6e00a7a9fd66d4050e5ddcf87176462067cd
2022-11-01 07:58:57 +00:00
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