Commit Graph

113560 Commits

Author SHA1 Message Date
kellyz
1bda6428c2 Enable predictive back gesture for Settings app.
Bug: 238729272
Test: manually tested on device
Change-Id: Ib75902d1d7bbd289705cb62ef00d5840676bda72
2022-07-22 02:27:01 +00:00
Julia Reynolds
de6ed69527 Merge "Improve App notification loading" into tm-qpr-dev am: 4ab5255893 am: 6292d9ff8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19290333

Change-Id: Ifb860cdab87fc01ba578346167361a1d30ae9695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 21:06:49 +00:00
Julia Reynolds
6292d9ff8c Merge "Improve App notification loading" into tm-qpr-dev am: 4ab5255893
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19290333

Change-Id: Iac930f653c146436863978c1c98439d2e63a6837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 20:48:46 +00:00
Julia Reynolds
4ab5255893 Merge "Improve App notification loading" into tm-qpr-dev 2022-07-21 20:30:21 +00:00
Julia Reynolds
f3b9bf55a9 Move zen rule deletion
To a non-exported component

Test: manually delete a rule in Settings
Fixes: 233607507
Change-Id: I6c4ac930eb62a2068582021d0ad16b93fbc9bdd3
2022-07-21 14:54:42 -04:00
TreeHugger Robot
d81bf8cd3a Merge "Bool to note Pending Intent bug fixed" 2022-07-21 15:13:10 +00:00
Simon Wingrove
da96b47ce8 Bool to note Pending Intent bug fixed
A workaround can be used to cover for the fact that PendingIntents sent
by Settings might differ only by Intent extras (and thus be wrong). This
bool notes that the issue is fixed so the workaround code can be
dropped.

Bug: 238605613
Test: manually
Change-Id: I478dd5fbd53d1dafd049e392a186d9796dd179cb
2022-07-21 10:27:30 +00:00
Neil Fuller
d8b54cd28d Merge "Change high/low bound logic for manual date/time" 2022-07-21 09:22:48 +00:00
Vincent Wang
65f53e98e3 Fix Delete face model button flicker
Update the visibility of button in onCreate & onActivityResult to
avoid button flicker

Bug: 191112124
Test: Reference reproduce step in b/191112124
Change-Id: I68e42433631db27e3f8f03ab4fc68e2326852f9b
2022-07-21 09:06:51 +00:00
Bill Yi
3bab68f912 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31 -s ours am: 69dee8d4a8 -s ours am: ba0a0c61fb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19346821

Change-Id: Ic5723bd15ac104fdd1179be16e1d34a1346c928e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 16:58:11 +00:00
Peter_Liang
e1c4901ce8 Fix the inconsistent alignment of the main switch preference.
Remove the redundant function.

Bug: 232494666
Test: manual test
Change-Id: I1827d39b194048452b71c680e2bbf94e43bfcac5
2022-07-21 00:56:07 +08:00
Bill Yi
ba0a0c61fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31 -s ours am: 69dee8d4a8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19346821

Change-Id: I220740fab54098c73118a4c3f5edbcd871593274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 16:54:53 +00:00
Bill Yi
17ab4dca57 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31 -s ours am: 9f2d455437 -s ours am: b393114b83 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19346821

Change-Id: I394c573ba319636d23702b256c31e01da718e89a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 16:53:18 +00:00
Bill Yi
b393114b83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31 -s ours am: 9f2d455437 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19346821

Change-Id: I7779d4f4cdb32e775152de3da0a5479fc03ac389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 16:40:51 +00:00
Bill Yi
9f2d455437 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19346821

Change-Id: If9b6741a081ae169312a2a340b65637951abc96e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 16:33:30 +00:00
Bill Yi
69dee8d4a8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19346821

Change-Id: Icc93244f4cce2e97f1698939779b6e693e478f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 16:32:49 +00:00
Julia Reynolds
e90507373c Improve App notification loading
1) Use UiBlocker, for better animations for apps with a lot of channels
2) Only load data in onResume, because the data loading step in some
of the controllers is expensive

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Test: load small channel and large (6000ish) channel app pages
Test: load individual channel pages
Test: load in-app channel shelf UI
Fixes: 215072888
Change-Id: I9a1c96f75b02f94b3ffc529d17d9c0cad7752de1
2022-07-20 15:27:52 +00:00
TreeHugger Robot
ef289f99b5 Merge "Refactor Battery Chart View State Controll" 2022-07-20 13:34:35 +00:00
Zaiyue Xue
d4f9588a3d Refactor Battery Chart View State Controll
When users click the battery chart, the orignal behavior is that the view changes the state by itself.
This cl refactors the bahavior to that the view callbacks to the controller, and
the controller changes the view's state.
In this way, the controller is the only source of truth of the state.
This meets the controller-view model.

Test: manual
Bug: 239491373, 236101166
Change-Id: I754ded2dba20319f1571374dfdbef27f2420ed78
2022-07-20 09:38:23 +00:00
Sorin Basca
4bb1562c56 [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours am: 5781b7ab3a -s ours am: 0085dcc80c -s ours am: b9cd87f468 -s ours am: fec750d98f -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: I88fe318dc436f21fb07ffc8e2b3c76ac0bba47a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 07:43:28 +00:00
Sorin Basca
c8b09463a9 [automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours am: ea4c4757bb -s ours am: b3fb29a4e3 -s ours am: 9cef5199a5 -s ours am: d07b2242fa -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: Id768186c959ee0fa195719abe46ad2dfecd6820d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 07:43:15 +00:00
Sorin Basca
fec750d98f [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours am: 5781b7ab3a -s ours am: 0085dcc80c -s ours am: b9cd87f468 -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: Ic024b1ae2cd93580472f9da586881df044d8b5bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 07:11:20 +00:00
Sorin Basca
d07b2242fa [automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours am: ea4c4757bb -s ours am: b3fb29a4e3 -s ours am: 9cef5199a5 -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: Iefd343d353203140d856945fb504bbe9ca93d02c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 07:11:06 +00:00
Sorin Basca
b9cd87f468 [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours am: 5781b7ab3a -s ours am: 0085dcc80c -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: Ia3ec9464567b759ab02b1231af36ae78da7799a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 06:47:13 +00:00
Sorin Basca
9cef5199a5 [automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours am: ea4c4757bb -s ours am: b3fb29a4e3 -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: Idb5adda6eb8b19760fb1a335ee4d3fd8cdde6bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 06:47:07 +00:00
Sorin Basca
0085dcc80c [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours am: 5781b7ab3a -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: I01c4d0a739da9f35f0c45561a04cc8273969bb78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 06:26:16 +00:00
Sorin Basca
b3fb29a4e3 [automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours am: ea4c4757bb -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: I8cdf0303f4a286ebc74bcb2af74aac2598075805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 06:26:05 +00:00
Sorin Basca
5781b7ab3a [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: I9f616094bf9b1e54edd58918e6504885207f04e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 05:55:36 +00:00
Sorin Basca
ea4c4757bb [automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643

Change-Id: Id9c27926a1f4cf518aa4c9b0ba69ed51f7dda310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 05:55:23 +00:00
Sorin Basca
6a043ec5dc Merge "Use Mockito 4.6.1 API" 2022-07-20 05:32:35 +00:00
Himanshu Rawat
aa1950fd80 Don't cancel passkey entry pairing autonomously
Bluetooth pairing is cancelled if the pairing popup is closed without
explicitly accepting the pairing. However there is no way to
explicitly accept the pairing when the local device displays for the
passkey entry or pin key entry pairing method.
As a result all passkey entry and pin key entry pairings, where the
local device is displaying the value, are cancelled after the pairing
is successful. If the BT stack has not completed the SDP search when
the pairing is cancelled after successful pairing, it may result in
removal of the bond information.

Bug: 237757124
Test: Pair with BT HID keyboard; adb logcat | grep "BTPairingController:
Pairing dialog canceled"

Change-Id: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
2022-07-20 03:33:55 +00:00
TreeHugger Robot
1489a54577 Merge "Update all preferences when the account preference updates UI" into tm-qpr-dev am: 6e14ff02e8 am: b47e7b4248
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19192851

Change-Id: I7772126785874bfa190e70003221c5a8a9e39ec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 03:07:12 +00:00
TreeHugger Robot
b47e7b4248 Merge "Update all preferences when the account preference updates UI" into tm-qpr-dev am: 6e14ff02e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19192851

Change-Id: I832dcbc2fa78a81f9d64169d80cdc5a9aed5df4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 02:48:33 +00:00
TreeHugger Robot
6e14ff02e8 Merge "Update all preferences when the account preference updates UI" into tm-qpr-dev 2022-07-20 02:22:44 +00:00
Bill Yi
db7f7b6d31 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2ca813a72a28c275eacf6dda32ad36d491aa48b9
2022-07-19 13:59:24 -07:00
Grace Cheng
16aacff410 Merge "Add missing description to SUW set pattern lock UI" into tm-qpr-dev am: 66625c9c7b am: 5aff3d9de6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19303032

Change-Id: Ib913526c5340f4cce6f4d670433c947edd704980
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 20:30:19 +00:00
TreeHugger Robot
42c02ad936 Merge "Prevent leaking Wi-Fi dialog on lock screen" into tm-qpr-dev am: bd41fe5a5b am: 3d6b632232
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19207636

Change-Id: I66292ce19a0616253ec8f23a185d34aa7a03a977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 20:24:42 +00:00
Sorin Basca
199f6a4ed0 [automerger skipped] Use Mockito 4.6.1 API am: e2b0873f9c -s ours am: dd00927d16 -s ours am: 522bcbd7fc -s ours am: 5b0b7de3d5 -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 61e0bcd194 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19334952

Change-Id: Idbdbed2572606ce0d1c51004827c3f60f30b222c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 20:22:37 +00:00
Julia Reynolds
c961d97a2e Update strings am: 21744cf2d1 am: bfe54c8ad0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19325246

Change-Id: Id84be5f2811095f9f7fd982f9653630e403cacd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 20:09:12 +00:00
Treehugger Robot
de39a970c5 Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7c3 am: 2a0a88af4d am: dad4720a31 am: cb4de95600 am: 3ce3686836
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780

Change-Id: Id8a56f0aceb2710d4ce2c0445b233f3f808185b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 20:09:02 +00:00
TreeHugger Robot
d257564701 [automerger skipped] [conflict] [conflict] Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am: ac6af411ed am: 326c0ea30c am: 91aec69fdc -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 c1c3a84fdc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19324395

Change-Id: I779bcb7e74b3eddaa1ead5418eba33bd91e8d891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 19:48:58 +00:00
Grace Cheng
5aff3d9de6 Merge "Add missing description to SUW set pattern lock UI" into tm-qpr-dev am: 66625c9c7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19303032

Change-Id: Iaaef33597b7a6c79deb5154bc9b7841af8f5e48f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 19:42:56 +00:00
Grace Cheng
66625c9c7b Merge "Add missing description to SUW set pattern lock UI" into tm-qpr-dev 2022-07-19 19:31:06 +00:00
TreeHugger Robot
f7f800793c Merge "Add class BatteryDiffData used to parcel battery usage data" 2022-07-19 18:01:45 +00:00
TreeHugger Robot
3d6b632232 Merge "Prevent leaking Wi-Fi dialog on lock screen" into tm-qpr-dev am: bd41fe5a5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19207636

Change-Id: I8ea19a4c48286a2185450116f06a3314087c5be8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 17:21:39 +00:00
TreeHugger Robot
bd41fe5a5b Merge "Prevent leaking Wi-Fi dialog on lock screen" into tm-qpr-dev 2022-07-19 17:02:10 +00:00
Kuan Wang
5c98e155c2 Add class BatteryDiffData used to parcel battery usage data
Add class BatteryDiffData used to parcel battery usage diff data per
apps. It behaves as an interface between UI and data.

Bug: 236101687
Test: make RunSettingsRoboTests
Change-Id: I59daa9e8c5de2105ebf24c7a585c02e554735e78
2022-07-19 15:47:51 +00:00
Sorin Basca
5b0b7de3d5 [automerger skipped] Use Mockito 4.6.1 API am: e2b0873f9c -s ours am: dd00927d16 -s ours am: 522bcbd7fc -s ours
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 61e0bcd194 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19334952

Change-Id: I6bc4f9e950642a51e6b3158b4168826521ed3d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 12:51:33 +00:00
Neil Fuller
d0a3929327 Change high/low bound logic for manual date/time
This commit moves knowledge of the upper / lower bounds for valid manual
date suggestions to (internal) API calls.

It adds a test to confirm the API calls are used to configure the date
dialog.

Further, it removes redundant filtering from the client that would
prevent suggestion calls being made if the settings UI considers them
invalid. Year bounds are already used to limit the UI entry, and the
system server will return false from the service call if the suggestion
is invalid, though the SettingsUI doesn't do anything (behaviorally)
with the false before or after this change.  After this change it is
logged.

The goal of this change is to allow users with devices that don't have
the Y2038 issue to enter dates > 2037. This could have been done with
a smaller change, but the use of the new internal class
TimeDetectorHelper means that the bounds logic is in one place. The
lower bound (on mobile devices) can now be changed relatively easily by
touching one class.

Bug: 228967927
Test: m RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.datetime"
Change-Id: Iaf1ca8220e0e96773aa71b595da9c1ba1e50d59d
2022-07-19 13:43:36 +01:00
Julia Reynolds
bfe54c8ad0 Update strings am: 21744cf2d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19325246

Change-Id: I163c8692eb166b134cf7cabb8434429be43f3911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 12:41:07 +00:00