Lucas Silva
d6b9e333e6
Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: b58d2ed5cd am: a8b6c03607
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768
Change-Id: I281a9ab5a8008a31dfcd2bfece4e2aeec66d484e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 15:24:36 +00:00
Lucas Silva
a8b6c03607
Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: b58d2ed5cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768
Change-Id: I256e53b6d9f41c7cef1ec510cbf5d85a59dd1ae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 15:03:20 +00:00
Lucas Silva
b58d2ed5cd
Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18095768
Change-Id: I9bb07c53e0dbd2f78e4d7191ebf597af3de12a06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 14:44:00 +00:00
Lucas Silva
dc44eb1feb
Merge "Update dream settings logic to keep the customize button unselected." into tm-dev
2022-05-02 14:19:22 +00:00
Bonian Chen
f542bd5484
Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2 am: 2276920b9b am: e518b8848e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069
Change-Id: I0c64101660dcab721481bc12c2301dca583c8e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-30 00:02:08 +00:00
Bonian Chen
e72076fb7c
Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410 am: 480c80f79d am: 226d1a137d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870
Change-Id: I5222759cadf210f178b2190adb85be2b639a39a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-30 00:02:01 +00:00
TreeHugger Robot
941d8b875b
Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a am: fb214b99c0 am: a2e15fd03c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823
Change-Id: I3e322e656b80c116ffd2c0b49872b4136618dbd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-30 00:01:55 +00:00
TreeHugger Robot
08233064f9
Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb am: e76c4e0d0a am: a20c3a082b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822
Change-Id: Icbc5db591f1239ab45b7f926053819961d846df5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-30 00:01:22 +00:00
Chaohui Wang
1fdbb3efa5
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd am: bda9049621 am: e54e855b1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070
Change-Id: Ia20f27636ded72939cedb698e6dc72541b44c50c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-30 00:00:50 +00:00
Bonian Chen
e518b8848e
Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2 am: 2276920b9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069
Change-Id: Icb56a73efe4945099d13c8a6d81093c379050cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:45:22 +00:00
Bonian Chen
226d1a137d
Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410 am: 480c80f79d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870
Change-Id: I5d05f75c2a5d9fb24549cd89424a22a9e10383ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:45:03 +00:00
TreeHugger Robot
a2e15fd03c
Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a am: fb214b99c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823
Change-Id: Ib350ef8ba53530293ac074ce39c9afdcac633ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:44:46 +00:00
TreeHugger Robot
a20c3a082b
Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb am: e76c4e0d0a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822
Change-Id: I165c9e086d54b87f6d2ed9c52ac47b0a711fcd8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:44:11 +00:00
Chaohui Wang
e54e855b1b
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd am: bda9049621
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070
Change-Id: Ib087add327143c0d12541e55ee586b01908af3a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:43:48 +00:00
Joshua Mccloskey
d1a232d24e
Merge "Fix final UDFPS enrollment haptic." into tm-dev am: 8f463f5c88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18083583
Change-Id: I2f8a9966f03a4362d2bb2f57269f31b8e556d197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:28:50 +00:00
Bonian Chen
2276920b9b
Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069
Change-Id: Idac304bab5480e12813a2b99b875673abcbb7a75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:27:25 +00:00
Bonian Chen
480c80f79d
Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870
Change-Id: I4531e4611b2b52e6d3153042d5d2a24d969c9c23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:27:17 +00:00
TreeHugger Robot
fb214b99c0
Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823
Change-Id: I288a6d876107c243b7e173e21cd396091a3503f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:27:08 +00:00
TreeHugger Robot
e76c4e0d0a
Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822
Change-Id: Ib95ca3193d615adf17c47deba31b1e6930753a6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:26:52 +00:00
Chaohui Wang
bda9049621
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070
Change-Id: I860b9d924cf2da922f3154008a194fe2ad0e3288
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:26:34 +00:00
Joshua Mccloskey
8f463f5c88
Merge "Fix final UDFPS enrollment haptic." into tm-dev
2022-04-29 22:59:19 +00:00
Joshua McCloskey
b7f3001cea
Fix final UDFPS enrollment haptic.
...
Test: Verified both accessibility/non-accessibility flows
have correct haptic feedback.
Fixes: 229804277
Change-Id: I8623771016b9819d4211d07a19b50291a8b06cd9
Merged-In: I8623771016b9819d4211d07a19b50291a8b06cd9
2022-04-29 22:52:44 +00:00
Lucas Silva
e2ef52d6f1
Update dream settings logic to keep the customize button unselected.
...
Test: manually on device
Bug: 227717835
Fixed: 227717835
Change-Id: I4d796c3b7510baf07a670347fe4112a0b95d3036
2022-04-29 20:43:20 +00:00
Automerger Merge Worker
c17fe4d6ff
Merge "Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec am: e0d4b99626" into tm-d1-dev-plus-aosp am: 323cd11c86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961
Change-Id: I5e98c83254916568c56eb1069ce3a2fc97b94025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 19:33:37 +00:00
TreeHugger Robot
96e3d8a94b
Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29 am: 964aeabd9e am: 01b9111333
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824
Change-Id: Ib213107e0a5e568174b26730a3aec15f45219fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 19:33:06 +00:00
Calvin Pan
603abf2fb3
Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f am: 4f56ab0898 am: e32850726b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006
Change-Id: I7ce87fce7174661986e185421388ab2feb984a6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 19:32:59 +00:00
Automerger Merge Worker
63df111bee
Merge "Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5 am: 268fb81908" into tm-d1-dev-plus-aosp am: 1f616d666f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166
Change-Id: I22ded50b941f17d74b71ebd771b20fc290715047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 19:30:58 +00:00
TreeHugger Robot
10b2a550fe
Merge "Remove loading spinner from Premium SMS access" into tm-dev am: 611db9e8be am: 4d5385e6e3 am: 1b4d1b14e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903584
Change-Id: I471fa0cbe6709f81504cf6d570c32de5743b6bd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 19:30:25 +00:00
YK Hung
b6deeac7f3
Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev am: 55fcb02aca am: 2e7695458f am: 2c3560fbbb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030883
Change-Id: I1c935a73a22eb9d056d463b958fe0447d0866e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 19:26:01 +00:00
Julia Reynolds
8380ae2717
Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec am: e0d4b99626
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961
Change-Id: Id08cbd0e1c333c35296b9048ed871073c6286fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:29:27 +00:00
TreeHugger Robot
01b9111333
Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29 am: 964aeabd9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824
Change-Id: If2951fb77c4ff4d4f59c4b1d3e07bd1045b45373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:29:04 +00:00
Calvin Pan
e32850726b
Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f am: 4f56ab0898
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006
Change-Id: I1b9830f7419f947c6e9a060349d617342a8dce37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:28:55 +00:00
Betty Chang
e4f6fcba02
Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5 am: 268fb81908
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166
Change-Id: I1adec36e8839fb509b3bb6cde5d4953917ecea7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:28:05 +00:00
TreeHugger Robot
1b4d1b14e9
Merge "Remove loading spinner from Premium SMS access" into tm-dev am: 611db9e8be am: 4d5385e6e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903584
Change-Id: I269e4ed15a723fccd8dc95f184dec25c2dcb2415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:27:45 +00:00
YK Hung
2c3560fbbb
Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev am: 55fcb02aca am: 2e7695458f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030883
Change-Id: Ic9c2f1f9b03b554b8e876a59eb347a1f5be87bb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:27:34 +00:00
Prabal Singh
4cdce44fac
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e am: 7642301f28 am: f52e82eb8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601
Change-Id: I40a8b70116ad90a54c39f8b7405795141c894edd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:25:26 +00:00
Prabal Singh
f52e82eb8c
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e am: 7642301f28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601
Change-Id: I7e08a7863af94ea3db2138797f18747e046b40ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:01:38 +00:00
Julia Reynolds
e0d4b99626
Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961
Change-Id: I805115970058ccaa97e4538955393c12bf5bb39d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:40:21 +00:00
TreeHugger Robot
964aeabd9e
Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824
Change-Id: Iaefe2c50673077f1aac0e77f03e27451911a2885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:39:55 +00:00
Calvin Pan
4f56ab0898
Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006
Change-Id: Ib72a28d7fbf8c7120ed9d1e3076ca5386de51fb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:39:46 +00:00
Betty Chang
268fb81908
Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166
Change-Id: If9e1fa315a2c26369cc8d50292a53527d4027526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:37:56 +00:00
TreeHugger Robot
4d5385e6e3
Merge "Remove loading spinner from Premium SMS access" into tm-dev am: 611db9e8be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903584
Change-Id: I172b47e725fd08cd8f3af954611c0599b8e3a97d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:37:29 +00:00
YK Hung
2e7695458f
Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev am: 55fcb02aca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030883
Change-Id: I2573026d8cd8dd2dc8c0f9e8ff2842240a7f66a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:37:20 +00:00
Bonian Chen
5ef52de6b2
Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev
2022-04-29 16:00:31 +00:00
Bonian Chen
7bdf717410
Merge "[Settings] Rename title of SIM UI when changed" into tm-dev
2022-04-29 15:59:32 +00:00
TreeHugger Robot
38989c9c6a
Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev
2022-04-29 15:16:44 +00:00
TreeHugger Robot
30bba3bbdb
Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev
2022-04-29 09:51:21 +00:00
Bonian Chen
ba943c9b94
[Settings] Rename title of SIM UI when changed
...
Title of subscription page should align with the SIM card.
Bug: 230308627
Test: local
Change-Id: Iab9ba25ac8c3faf7d37f97c8f3f3488cbaa2e228
2022-04-29 09:10:47 +00:00
Chaohui Wang
71e03076cd
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev
2022-04-29 08:26:24 +00:00
Bonian Chen
0f68faf996
[Settings] Avoid from crash UI when querying data usage
...
Screen update been requested while querying data usage and response not
yet available.
This change tried to avoid from updating the UI in this case.
Bug: 210664126
Test: local
Change-Id: Id055fbd441936a9842b4acc978a894a855165bb7
2022-04-29 14:28:19 +08:00