Commit Graph

44434 Commits

Author SHA1 Message Date
Robert Luo
061a87fe1f Allow advanced VPN to manage connection status via its UI
Bug: 238641532
Test: atest -c VpnSettingsTest
Change-Id: Ia6f1d84bba38bab7f13f46dc8a4fdb4eb0505f8f
2022-07-29 18:31:13 +08:00
Hugh Chen
5cf2b7ff1f Refactor the condition order
Bug: 239984274
Test: atest -c VpnSettingsTest
Change-Id: Ic9e8c775b044fffd5dec5047fb53d75209418d85
2022-07-29 02:45:12 +00:00
TreeHugger Robot
1d001d6c1d Merge "Let advanced VPN profile visible immediately before the user consent to use VPN feature" 2022-07-28 11:53:16 +00:00
Hugh Chen
f03cbcf83b Let advanced VPN profile visible immediately before the user consent to use VPN feature
- This CL will check whether advanced VPN apk is exist or not,
  and if so then show the preference of advanced VPN in the
  "Settings > Network & internet > VPN".

Bug: 239984274
Test: atest -c VpnSettingsTest
Change-Id: I8c11c7f2079d6ebec6c691b8bf2fb26dfc450663
2022-07-28 09:48:18 +00:00
Julia Reynolds
bec6d10a80 Merge "Only show the channel toast if users expressly ask for it" into tm-qpr-dev am: 45bcb214da am: 197091ca8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19416082

Change-Id: Icd88b407b2fbfd0f76f62e32586179fb4ee50559
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-27 13:33:35 +00:00
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
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
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
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
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
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
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
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
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
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