Julia Reynolds
197091ca8a
Merge "Only show the channel toast if users expressly ask for it" into tm-qpr-dev am: 45bcb214da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19416082
Change-Id: Ie0c44628c38787a16cf055bf5a92c60071f7eaae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-27 13:19:58 +00:00
Julia Reynolds
45bcb214da
Merge "Only show the channel toast if users expressly ask for it" into tm-qpr-dev
2022-07-27 13:11:50 +00:00
Arc Wang
03182b5781
Merge "Avoid 2-pane deep link before gone through Setup Wizard"
2022-07-27 06:26:51 +00:00
Weng Su
0553d8fbe5
Merge "Restrict WifiScanModeActivity for guest user" into tm-qpr-dev am: b4ad581fe7
am: 17070ee0c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394734
Change-Id: I505207cbd0ea7250583416c7fdfd898de6175948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-27 04:53:46 +00:00
Weng Su
17070ee0c4
Merge "Restrict WifiScanModeActivity for guest user" into tm-qpr-dev am: b4ad581fe7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394734
Change-Id: If5fbf81277d74626b246338d0e9f3d010805262f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-27 04:42:53 +00:00
Weng Su
b4ad581fe7
Merge "Restrict WifiScanModeActivity for guest user" into tm-qpr-dev
2022-07-27 04:31:05 +00:00
TreeHugger Robot
99de6b6693
Merge "Update trapezoid validation in battery chart view."
2022-07-27 04:17:17 +00:00
Tsung-Mao Fang
1ad5aa87c2
Set an action name for wallpaer index am: 0f7b80f47f
am: 68fa74625c
am: ec0e4b41f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394202
Change-Id: I29c73c7bae6e84b2ebc644be62d5dabecdcfe7da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-27 03:44:08 +00:00
Tsung-Mao Fang
994d27d9df
Set an action name for wallpaer index am: 0f7b80f47f
am: b0f9134441
am: fefafaabf1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394202
Change-Id: I9543c8cc2c92ddfcfae4554d081f1b16a0e53479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-27 03:43:45 +00:00
Jason Chiu
633971775b
Merge "Enable ignored slice provider tests"
2022-07-27 03:31:32 +00:00
Arc Wang
be2ea9eb39
Avoid 2-pane deep link before gone through Setup Wizard
...
To improve security.
Fix: 238391432
Test: manual
Flash ROM and check 2-pane bebavior
Change-Id: If96c645319d9df45930644fd438cf479462685b0
2022-07-27 11:27:33 +08:00
Tsung-Mao Fang
ec0e4b41f4
Set an action name for wallpaer index am: 0f7b80f47f
am: 68fa74625c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394202
Change-Id: Ica13f797d30a9a5c8c68e93b107b62f89c032f3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-27 03:22:41 +00:00
Tsung-Mao Fang
fefafaabf1
Set an action name for wallpaer index am: 0f7b80f47f
am: b0f9134441
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394202
Change-Id: Idfbf2786117d7e264b1da6f1101da99db23b76c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-27 03:22:00 +00:00
Tsung-Mao Fang
68fa74625c
Set an action name for wallpaer index am: 0f7b80f47f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394202
Change-Id: Id464e7cb46590b003ecb2fab9d73b69fc14fda9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-27 03:02:38 +00:00
Tsung-Mao Fang
b0f9134441
Set an action name for wallpaer index am: 0f7b80f47f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394202
Change-Id: Ibcfaa3afcbe2fde0a00c717883c3007bdecb0ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-27 03:02:35 +00:00
Menghan Li
6544dee983
Merge "Refactor CaptionAppearanceFragment to improve maintainability (5/n)"
2022-07-26 22:18:44 +00:00
TreeHugger Robot
47a609fae5
Merge "Grant CONTROL_UI_TRACING permission to Settings app (2nd try)"
2022-07-26 20:51:19 +00:00
TreeHugger Robot
6c39e471b7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196
-s ours am: 058c5b262d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: I73439d95d030377adaea2e450894497aa5f9d15a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 17:07:01 +00:00
Bill Yi
ec9d6133d6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6
-s ours am: 58514f6237
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: Iba5b5ab88b45798684f7f348f9a782b59548c6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 17:06:38 +00:00
Bill Yi
451bfb195e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558
am: 011d462ac4
-s ours am: f49b1b5f37
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530
Change-Id: Id1557370bbae0fb8613d22d95cfc7843fcb851c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 16:56:31 +00:00
TreeHugger Robot
acf051b632
Merge "Add dock charging state into stay awake feature (1/2)" into tm-qpr-dev am: bcfe28d0a9
am: b4e676f341
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19114749
Change-Id: Ia31d866c84efc068c9de21e9f8c87fc1fc757922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 16:53:27 +00:00
TreeHugger Robot
b4e676f341
Merge "Add dock charging state into stay awake feature (1/2)" into tm-qpr-dev am: bcfe28d0a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19114749
Change-Id: I6608b83db79c615c66915f9b4bec0e670758fcb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 16:37:10 +00:00
TreeHugger Robot
bcfe28d0a9
Merge "Add dock charging state into stay awake feature (1/2)" into tm-qpr-dev
2022-07-26 15:42:37 +00:00
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
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