Commit Graph

44409 Commits

Author SHA1 Message Date
Julia Reynolds
d9da74762e Merge "Revert "Improve App notification loading"" into tm-qpr-dev am: 6a110b91f8 am: 397c885c46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19419547

Change-Id: I63bd0eb21941240d8b36348fa6b9a0f8d3bb9119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 15:32:06 +00:00
Julia Reynolds
397c885c46 Merge "Revert "Improve App notification loading"" into tm-qpr-dev am: 6a110b91f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19419547

Change-Id: Ib22e2fc711b81772e7ddbafd786181bf694b46d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 15:13:06 +00:00
Julia Reynolds
6a110b91f8 Merge "Revert "Improve App notification loading"" into tm-qpr-dev 2022-07-26 14:56:20 +00:00
TreeHugger Robot
047d58ebdb Merge "Add battery chart view model." 2022-07-26 08:50:26 +00:00
Chaohui Wang
0c55354039 Merge "Clean up unused bluetooth resources" 2022-07-26 08:10:05 +00:00
Zaiyue Xue
05bf785859 Add battery chart view model.
Test: manual
Bug: 239491373
Bug: 236101166
Change-Id: I1ae0e5fcc006855ac552fbbdfb4cd73f3dec52e7
2022-07-26 06:34:43 +00:00
TreeHugger Robot
efbb071933 Merge "Run lock before single sensor enroll" 2022-07-26 04:57:06 +00:00
Chaohui Wang
8589b41994 Clean up unused bluetooth resources
Bug: 234570979
Test: make Settings app
Change-Id: I23d5a3dc27fe5df5ba45b8593c9f2ad3d7c25cbc
2022-07-26 12:53:24 +08:00
Himanshu Rawat
884a10c84e Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7 am: 7c6a004452 am: 99bbb571f3 am: 8fc819f87a am: e379ccfff2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779

Change-Id: Iee681eb028dd51fd744c2fb4f0ac3306fea2e1fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 04:37:02 +00:00
Himanshu Rawat
e379ccfff2 Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7 am: 7c6a004452 am: 99bbb571f3 am: 8fc819f87a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779

Change-Id: I5d5ca2f1721ec6cf53c37eb37e150acf5ef4411e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 04:11:07 +00:00
Himanshu Rawat
8fc819f87a Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7 am: 7c6a004452 am: 99bbb571f3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779

Change-Id: I7e51117d355b763c0f3d299864cb40dabed90c4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 03:44:20 +00:00
Himanshu Rawat
99bbb571f3 Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7 am: 7c6a004452
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779

Change-Id: I1fa257f586e109a15aa1a26f9153ddcc6ba5b866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 03:18:47 +00:00
Himanshu Rawat
7c6a004452 Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779

Change-Id: I7680942ca7ac5da3799b10306b1a3849800a1f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 02:17:18 +00:00
Bill Lin
df8e07a9ae Merge "Fix incorrect SetupChooseLockPattern layout" into tm-qpr-dev am: 483c9b7206 am: 008f70c249
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394732

Change-Id: Idbae9c4f9b8a4f278c6e746a6df1fb2481349515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 01:35:33 +00:00
Milton Wu
81626fb1c8 Run lock before single sensor enroll
Run setOrConfirmCredentialsNow() before enrolling for devices w/
single-sensor

Bug: 239105333
Test: atest BiometricEnrollActivityTest
Test: Manually test multi-sensor and single-sensor devices
Change-Id: I807418c842eb076974f839a0d08bae67d3bc51dc
2022-07-26 01:23:55 +00:00
Bill Lin
008f70c249 Merge "Fix incorrect SetupChooseLockPattern layout" into tm-qpr-dev am: 483c9b7206
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394732

Change-Id: Ib149edd918076d46f98d657169e13bc2d34cdef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 01:17:02 +00:00
Bill Lin
483c9b7206 Merge "Fix incorrect SetupChooseLockPattern layout" into tm-qpr-dev 2022-07-26 00:45:37 +00:00
TreeHugger Robot
bb3f1526f8 Merge "Send metric intent back to SUW" into tm-qpr-dev am: 587da7dfc3 am: 6a8f459e6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19378812

Change-Id: I4c514938ee427ed267b0e7f7c18ff25806b8b2da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25 23:08:14 +00:00
TreeHugger Robot
6a8f459e6c Merge "Send metric intent back to SUW" into tm-qpr-dev am: 587da7dfc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19378812

Change-Id: If60a5eacd90ba186423183da0883d1252309d825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25 22:41:04 +00:00
TreeHugger Robot
587da7dfc3 Merge "Send metric intent back to SUW" into tm-qpr-dev 2022-07-25 22:18:04 +00:00
Neha Jain
c5f1cb11e0 Revert "Improve App notification loading"
Revert "Fix binder error when an app has many channels"

Revert submission 19290255-jr-bind-flicker

Reason for revert: b/240100577
Reverted Changes:
I9a1c96f75:Improve App notification loading
I391ce0b10:Fix binder error when an app has many channels

Change-Id: Iaae40de74d135a79c18201ec17e00f3d9d5f0f3b
2022-07-25 22:16:16 +00:00
Patrick Baumann
64fc3f5fa2 Merge "Require permission while sending QUERY_PACKAGE_RESTART" 2022-07-25 20:35:56 +00:00
Julia Reynolds
38863695fd Merge "Move zen rule deletion" into tm-qpr-dev am: 7ab7c1d6f8 am: cf3fc8d0b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19377234

Change-Id: I69bc3bcd386422febab4aef1bac86ea09637b520
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25 17:52:01 +00:00
Peter Zhang
9b502ca1d2 Merge "Improve the UI of Press & hold power button settings" into tm-qpr-dev am: 1cc741a745 am: 179c4dd48a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19291450

Change-Id: I970ace8e8cee5aa3e23693d2a3985999f8f10b8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25 17:50:30 +00:00
Julia Reynolds
cf3fc8d0b5 Merge "Move zen rule deletion" into tm-qpr-dev am: 7ab7c1d6f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19377234

Change-Id: I25fdf9997ff4fe2dc97577e709f20df32317e10d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25 17:33:36 +00:00
Peter Zhang
179c4dd48a Merge "Improve the UI of Press & hold power button settings" into tm-qpr-dev am: 1cc741a745
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19291450

Change-Id: I7f3ea617800c37f49d8534131728875c0cd1d243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25 17:33:08 +00:00
Julia Reynolds
7ab7c1d6f8 Merge "Move zen rule deletion" into tm-qpr-dev 2022-07-25 17:24:42 +00:00
Peter Zhang
1cc741a745 Merge "Improve the UI of Press & hold power button settings" into tm-qpr-dev 2022-07-25 17:18:25 +00:00
PETER LIANG
e000f54431 Merge "Fix the inconsistent alignment of the main switch preference." into tm-qpr-dev am: aea8f1aeb2 am: 26c3c3a95c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19358210

Change-Id: Iaa9faf78d8fd4813e9725f246745744e98d0c325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25 12:44:12 +00:00
PETER LIANG
26c3c3a95c Merge "Fix the inconsistent alignment of the main switch preference." into tm-qpr-dev am: aea8f1aeb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19358210

Change-Id: I38ed641d9b1df23306f2d1e78b705d02592f34b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25 12:25:25 +00:00
PETER LIANG
aea8f1aeb2 Merge "Fix the inconsistent alignment of the main switch preference." into tm-qpr-dev 2022-07-25 12:05:17 +00:00
lbill
07b149ec51 Fix incorrect SetupChooseLockPattern layout
Root cause:
- The new added description TextView is too large
- sud_layout_description was add in sud_layout_content
  instead of sud_layout_header.

Solution:
- Set string lockpassword_choose_your_pattern_description
  to GlifLayout as it's description.(Header description)

Bug: 233666752
Fixes 239892091
Test: manual in setup flow, check choose lock pattern layouts
showing expectedly on both phone & tablet
Test: make RunSettingsRoboTests

Change-Id: Iabe503066434f8983dffb88d1c93f2bbf773b860
2022-07-25 12:01:46 +00:00
TreeHugger Robot
873a47576d Merge "Add DataProcessor to process raw history map for UI." 2022-07-25 11:03:35 +00:00
Tim Peng
d30f5d1ac5 Merge "AID_SYSTEM_USER - Main thread blocked at getConnectionSummary()" 2022-07-25 09:59:46 +00:00
Menghan Li
0f6f22225c Merge changes I5409c1e8,I8ed80b44
* changes:
  Refactor CaptionAppearanceFragment to improve maintainability (4/n)
  Refactor CaptionAppearanceFragment to improve maintainability (3/n)
2022-07-25 08:42:40 +00:00
Kuan Wang
287a40a9e9 Add DataProcessor to process raw history map for UI.
- Move interpolation from DatabaseUtil
- Add the logic to wrap processed history map to BatteryLevelData
- Change ImmutableList to List in BatteryLevelData because
  ImmutableList.of doesn't support null element.

Bug: 236101687
Test: make RunSettingsRoboTests
Change-Id: I0a842f24e5481faf65f667c08a4fdc11fe2f235c
2022-07-25 08:39:45 +00:00
menghanli
5356e0c0a9 Refactor CaptionAppearanceFragment to improve maintainability (4/n)
Root cause: There is a bunch of different logic of preferences in CaptionAppearanceFragment. It’s hard to implement new features and hard to maintain and hard to be testable.
Solution: Move out preset preference logic of CaptionAppearanceFragment into controllers to reduce the complexity of the relationship between preference and fragment.

Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CaptionPresetControllerTest CaptionAppearanceFragmentTest
Change-Id: I5409c1e8a6bdfc633abc304d8cf800ea0943de78
2022-07-25 12:26:27 +08:00
timhypeng
830cb48593 AID_SYSTEM_USER - Main thread blocked at getConnectionSummary()
-move getConnectionSummary() to background thread.

Bug: 239394377
Test: atest BluetoothDevicePreferenceTest
Change-Id: I6911f53860ff48ef6a9fa5fe3007c004e6e4a331
2022-07-25 01:28:46 +00:00
menghanli
16fbfe4e14 Refactor CaptionAppearanceFragment to improve maintainability (3/n)
Root cause: There is a bunch of different logic of preferences in CaptionAppearanceFragment. It’s hard to implement new features and hard to maintain and hard to be testable.
Solution: Move out color and edge preference logic of CaptionAppearanceFragment into controllers to reduce the complexity of the relationship between preference and fragment.

Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.accessibility
Change-Id: I8ed80b445a0d376a7e9dda87feda82420a78a9da
2022-07-25 09:18:11 +08:00
menghanli
755d691183 Refine AccessibilityGestureNavigationTutorial button type
Root cause: It is weird to display positive text for the negative button.
Solution: Change to the positive button.

Bug: 216189516
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityGestureNavigationTutorialTest
Change-Id: I8ffc6b7b5b510fab159a23af83bca4426f2dc81d
2022-07-25 08:40:24 +08:00
Menghan Li
59d3766914 Merge "Remove obsoleted code: AccessibilityGestureNavigationTutorial" 2022-07-22 21:52:26 +00:00
Peter Zhang
f0013da134 Improve the UI of Press & hold power button settings
The following changes has been made:
- The on/off toggle for Assistant now becomes two radio selectors ("Power Menu" and "Digital Assistant"). This is to make things clearer that Press & hold power button can be configured to power menu.
- The corresponding power menu animation will be shown when "Power Menu" is selected.
- The Assistant specific sensitivity settings and the foot notes are hidden when "Power Menu" is selected.
- Some minor wording updates according to the requests from Assistant / Settings UXW.

Bug: 229722937
Test: robotest, manual
Change-Id: Ib356fba861ad8c4a2626a0e0bd8cf3e4d90ce9a6
2022-07-22 16:07:52 +02:00
Milton Wu
68247caafc Send metric intent back to SUW
Add metric intent if ChooseLockGeneric is triggered in SUW.
1. Save the result bundle data from ChooseLockGeneric to cache inside
   BiometricEnrollActivity and pass back to SUW after all finished.
2. Since fingerprint enrollment trigger points in SUW for
   fingerprint-only or fingerprint + faceAuth devices are all moved
   from SetupFingerprintEnrollIntroduction to BiometricEnrollActivity,
   remove deprecated code from SetupFingerprintEnrollIntroduction.

Bug: 235458700
Test: Manually test fingerprint enroll with SUW or w/o SUW
Test: Manually test fingerprint enroll with unicorn SUW
Test: atest BiometricEnrollActivityTest
Test: robo tests FingerprintEnrollIntroductionTest
Change-Id: I34b2884ab4c2c65d464d91eaef0f58c72dad438b
2022-07-22 08:53:48 +00:00
menghanli
33dda10ae7 Remove obsoleted code: AccessibilityGestureNavigationTutorial
Don't show the button tutorial when changing into sysem button navigation

Bug: 197695932
Test: make RunSettingsRoboTest
Change-Id: Ied90a602cd3228ee6f36b4b50fb1c019429a271e
2022-07-22 15:38:09 +08:00
Wesley Wang
01eabef95b Merge "Update battery optimize page states condition" 2022-07-22 06:16:08 +00:00
Vincent Wang
9937a51355 Merge "Fix Delete face model button flicker" 2022-07-22 04:17:43 +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