Commit Graph

113764 Commits

Author SHA1 Message Date
Zaiyue Xue
532defdc85 Update trapezoid validation in battery chart view.
If the battery level data cannot be gotten for an hour, ag/19358207 changes the level indication from 0 to null. This cl updates the battery chart view trapezoid validation logic from checking the level not zero to not null.

Test: manual
Bug: 236101166
Change-Id: I240f2b02b94ba1a3d99022c7c72a7a5adb21f9a5
2022-07-26 18:04:00 +08: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
Jason Chiu
d1101896db Enable ignored slice provider tests
Test: robotest
Bug: 199371852
Change-Id: I6c1ef3eb64ecb0d6bdd0e973bd4e4727111b3aef
2022-07-26 14:46:26 +08: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
menghanli
0e7f366ffa Refactor CaptionAppearanceFragment to improve maintainability (5/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 custom perference visiblity 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: I53d4ca3809031587f8d6853b427774fd322a71d8
2022-07-26 12:25:56 +08: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
c2b402bd50 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
(cherry picked from commit aa1950fd80)
Merged-In: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
2022-07-26 03:15:38 +00:00
Himanshu Rawat
dc7aa0e87f 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
(cherry picked from commit aa1950fd80)
Merged-In: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
2022-07-26 03:15:36 +00:00
Tsung-Mao Fang
0f7b80f47f Set an action name for wallpaer index
Since Android T+, app has to assign an action name for opening a
external app page.

Test: Manual test wallpaper search result and can open.
Fix: 239867167
Change-Id: I4579aaf6e831ff82721c958e6b91ede4cabda2c8
2022-07-26 02:36:13 +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
Himanshu Rawat
059ab284e7 Merge "Don't cancel passkey entry pairing autonomously" 2022-07-26 02:00:52 +00:00
TreeHugger Robot
69a431d170 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 5a4cfeab80 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibc365f9ff68e5945fbd041fee874be35d7d7f13b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 01:53:01 +00:00
Bill Yi
d29bfba53e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3392372f5e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8509b4a07d93075be055e25f93cda364a9bcda7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 01:52:58 +00:00
Bill Yi
3d8e07ad4a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f2fa4aa6ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7afbe3ca9a9d1c7206819b4311f8c08fb10e3933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 01:52:51 +00:00
TreeHugger Robot
6a4d1a7720 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 62471e32ba -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifd08b7adda218778a2fba59bbdaa353efa1a8e7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 01:39:37 +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
LuK1337
988a76f5bb Settings: Make NetworkScanHelper max search time customizable
Default max search time (300) fails on some devices.

Test: Network scan works on OnePlus 9 after overlaying
      max network scan search time to 254.
Change-Id: Ia0038fac6d2000748e0aa08fd6a53f11876728d7
2022-07-25 17:44:40 -07: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
Bill Yi
e4686519c9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-07-25 19:55:07 +00:00
Bill Yi
0907a96ec2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-07-25 19:55:07 +00:00
Julia Reynolds
e4dc6c972f Only show the channel toast if users expressly ask for it
Test: NotificationChannelWarningsPreferenceControllerTest.java
Bug: 231150048
Change-Id: I4797a2184561ae3dcd03e62bfb78a90686458c6b
2022-07-25 19:39:49 +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
Weng Su
8b1e21f929 Restrict WifiScanModeActivity for guest user
- Don't show WifiScanModeActivity if the user is a guest.

Bug: 235601169
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiScanModeActivityTest

Change-Id: I8f1d162d9b15116c3deb3656b9af6851d4514947
2022-07-26 01:48:16 +08: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
Yohei Yukawa
c7fc742a3f Grant CONTROL_UI_TRACING permission to Settings app (2nd try)
We are going to guard the following IPCs with CONTROL_UI_TRACING
permission [1].

 * IWindowManager#startWindowTrace()
 * IWindowManager#stopWindowTrace()
 * IInputMethodManager#startImeTrace()
 * IInputMethodManager#stopImeTrace()

For QS DevelopmentTiles to continue being allowed to access those
IPCs, this CL gives CONTROL_UI_TRACING to the Settings app.

 [1]: Ibdeb38dc9a066cb8ed2904adcdac29014b166526
      2ad02a383b036b02a836a50a43c679a17c2fde6b

Bug: 172444310
Test: Manually verified as follows.
 1. build aosp_coral-userdebug and flash it.
 2. adb shell dumpsys package com.android.settings
 3. Verify that
      android.permission.CONTROL_UI_TRACING
    is granted.
Change-Id: Ic65176d34daebc2190c6009f70d99f8fcb725c00
2022-07-25 18:38:49 +09: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