Commit Graph

99468 Commits

Author SHA1 Message Date
Automerger Merge Worker
ede00b600c Merge "[automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16 -s ours am: 463624d522 -s ours am: 0a298b167d -s ours am: 0176f0dccd -s ours" 2022-01-13 05:57:22 +00:00
Edgar Wang
6ae8b2ce73 [automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062 -s ours am: 1ca7d315db -s ours am: 02a8368286 -s ours am: c1fb4cc177 -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 181c7e32f5 is already in history

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

Change-Id: I206a91c9d9350c6a022bc57a80522918ee037f7a
2022-01-13 05:57:17 +00:00
Edgar Wang
fc2dd902d1 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16 -s ours am: 463624d522 -s ours am: 0a298b167d -s ours am: 0176f0dccd -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 8e7cc8fa4d is already in history

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

Change-Id: I2b0e5a235a6d39ac564cf2f5211da140beb4644b
2022-01-13 05:57:16 +00:00
Automerger Merge Worker
5f970d7ad6 Merge "[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev am: 36a989cdff -s ours am: 2e19b6a0da -s ours am: 409b9b13ba -s ours" 2022-01-13 05:57:14 +00:00
Edgar Wang
52d65e4d24 [automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev am: 36a989cdff -s ours am: 2e19b6a0da -s ours am: 409b9b13ba -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 4fb753d22e is already in history

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

Change-Id: Ieb02813ea33530914263512ede2710f0e3fc1ce6
2022-01-13 05:57:10 +00:00
Edgar Wang
f252d373bf [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d -s ours am: edcb9c9b0e -s ours am: c363b9f075 -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972 is already in history

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

Change-Id: Ia737e6cb89cafd19d6a8ca937446423dd4f66ba4
2022-01-13 05:57:07 +00:00
Automerger Merge Worker
742e4accdc Merge "[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062 am: cea95e05ca -s ours" 2022-01-13 05:57:00 +00:00
Edgar Wang
2d002ecdb3 [automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062 am: cea95e05ca -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 359512cd95 is already in history

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

Change-Id: I086bb58d984d0925b5a24e11fa53414016d90b4b
2022-01-13 05:56:54 +00:00
Edgar Wang
0176f0dccd [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16 -s ours am: 463624d522 -s ours am: 0a298b167d -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 8e7cc8fa4d is already in history

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

Change-Id: I25fbef4a9b5d8799b36d5a588985d2508e9ecde2
2022-01-13 05:56:50 +00:00
Edgar Wang
dff5e67070 [automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-v2-dev am: 362000122e am: 60af57af90 -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 359512cd95 is already in history

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

Change-Id: Ida822f0fcfa4ae4b7ad0eac6ffc221498a570504
2022-01-13 05:56:48 +00:00
Edgar Wang
0a298b167d [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16 -s ours am: 463624d522 -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 8e7cc8fa4d is already in history

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

Change-Id: Ie5a778da092bf3055ec6ccc8641b684d7f54ad46
2022-01-13 05:45:13 +00:00
Edgar Wang
c1fb4cc177 [automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062 -s ours am: 1ca7d315db -s ours am: 02a8368286 -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 181c7e32f5 is already in history

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

Change-Id: I8a2468cd50c806ce585fd4f790410125b28b50e7
2022-01-13 05:44:58 +00:00
Edgar Wang
409b9b13ba [automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev am: 36a989cdff -s ours am: 2e19b6a0da -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 4fb753d22e is already in history

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

Change-Id: I3ad9f5982c86682587eaa61784181ae41178a188
2022-01-13 05:44:52 +00:00
Edgar Wang
02a8368286 [automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062 -s ours am: 1ca7d315db -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 181c7e32f5 is already in history

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

Change-Id: Ida96339b0445175625089d5833e6ff116949284f
2022-01-13 05:40:25 +00:00
Edgar Wang
2e19b6a0da [automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev am: 36a989cdff -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 4fb753d22e is already in history

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

Change-Id: I6ae5cb0b33e7d03ee6c0b259a94bb4541a1f843d
2022-01-13 05:40:19 +00:00
Edgar Wang
1ca7d315db [automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062 -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 181c7e32f5 is already in history

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

Change-Id: Ibd39dbbcfca577d349e68a971c6fe559323956b3
2022-01-13 05:40:19 +00:00
Edgar Wang
60af57af90 Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-v2-dev am: 362000122e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579590

Change-Id: I468a47507f90ae3434752f762993981eb5076eb6
2022-01-13 05:39:54 +00:00
Edgar Wang
463624d522 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16 -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 8e7cc8fa4d is already in history

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

Change-Id: I5e42a5a8939af57523b1691c5f525df746e94ac1
2022-01-13 05:39:53 +00:00
Edgar Wang
c363b9f075 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d -s ours am: edcb9c9b0e -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972 is already in history

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

Change-Id: I8f21f65450c0c3d9cb9f976e94273d5a35444094
2022-01-13 05:39:37 +00:00
Edgar Wang
cea95e05ca Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579588

Change-Id: Id08f433e70d184be4d38db04c5a4097ca6a803b1
2022-01-13 05:39:31 +00:00
Edgar Wang
edcb9c9b0e [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972 is already in history

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

Change-Id: I6bf44b9e56ac21a73b7ea20b756a4d93a438e485
2022-01-13 05:39:03 +00:00
Edgar Wang
2df76f6062 Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev 2022-01-13 05:27:40 +00:00
Edgar Wang
36a989cdff Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev 2022-01-13 05:27:31 +00:00
Edgar Wang
362000122e Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-v2-dev 2022-01-13 05:27:16 +00:00
TreeHugger Robot
f2b73bb69e Merge "Fix color checking error of the repohooks" 2022-01-13 05:04:21 +00:00
menghanli
9fd21d5853 Fix color checking error of the repohooks
Bug: 210353709
Test: repo upload
Change-Id: Ib0926751a29c30da26afeb0eaa7464eccec00280
2022-01-13 11:28:38 +08:00
Lais Andrade
54ed73ae6c Merge "Update Settings to use intensity settings as main preference keys" 2022-01-13 02:45:41 +00:00
TreeHugger Robot
a1c550650b Merge "Implement Tooltips widget for QS panel" 2022-01-13 00:11:03 +00:00
Lais Andrade
141b5bb3bc Update Settings to use intensity settings as main preference keys
Updating the Settings app to allow setting the value off for key
HAPTIC_FEEDBACK_INTENSITY. This setting state is also copied onto
HAPTIC_FEEDBACK_ENABLED setting, so both should be in sync after this
change.

Similar logic is applied between RING_VIBRATION_INTENSITY and
VIBRATE_WHEN_RINGING.

This will not disable the hardware feedback since that one is controlled
by a separate setting key now.

The "vibrate for calls" was also removed and the single toggle for
"vibrate first then ring gradually" was moved into the "Vibration &
haptics" page.

Bug: 185351540
Test: [HapticFeedback|NotificationVibration|RingVibration][Intensity|Toggle]PreferenceControllerTest
      and manual testing of the AOSP settings app
Change-Id: I9c94cef331a1500a1272a601ba32667ca995ddab
2022-01-12 22:59:29 +00:00
Ronish Kalia
a4da2c2121 Merge "Update settings string" 2022-01-12 17:44:53 +00:00
Oli Lan
13adae672e Merge "Add config flag in Settings to control whether restricted profiles are offered." 2022-01-12 17:40:09 +00:00
TreeHugger Robot
70e9695809 Merge "Update new API for checking the embedding status" 2022-01-12 12:55:50 +00:00
menghanli
e9f9985e95 Implement Tooltips widget for QS panel
- Show the illustration and QS tile label text
- Dynamic update popup window width by content
- Support the auto close timer API

Bug: 210353709
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityQuickSettingsTooltipWindowTest
Change-Id: I8e0d3ff4ef6a48a54ef1e80724002d2cd28d7ac3
2022-01-12 11:07:51 +00:00
Yuri Ufimtsev
7b5f806734 Merge "Exclude Privacy Settings from search if Safety Center is enabled" 2022-01-12 09:42:38 +00:00
Tsung-Mao Fang
13a76eb84e Update new API for checking the embedding status
Test: Make sure behavior is correct as it was in
search flow, higlight flow, regular settings flow, split screen flow.
Bug: 204399167

Change-Id: I7fc29c8cdbfc6682963591f4ff805070bea4ca22
2022-01-12 15:00:07 +08:00
TreeHugger Robot
580cc81f11 Merge "Revert "Revert "Revert "Prevent side channel package installation enumeration"""" 2022-01-12 05:22:05 +00:00
Betty Chang
277976811d Merge "Add WiFi Enterprise restrictions check for WiFi Configuration Addition" 2022-01-12 02:04:17 +00:00
Arc Wang
43928754a3 Revert "Revert "Revert "Prevent side channel package installation enumeration"""
This reverts commit d3512d2693.

Reason for revert: <To fix b/214020839 - Broken test: android.os.cts.AutoRevokeTest#testAutoRevoke_userAllowlisting>

Change-Id: I4be6314a107a66cda293252b6b3da33f928d1400
2022-01-12 01:14:49 +00:00
Alex Johnston
3ae979bf27 [automerger skipped] Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d am: d8124d47f0 -s ours am: ca8073159b -s ours am: d567862732 -s ours
am skip reason: Merged-In I7c23442e143a6d74935945e6f5e4ce5ce0ef77f0 with SHA-1 04c66a0a3c is already in history

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

Change-Id: Id977a554f2d8c37c5ec44838080a306bfea4e340
2022-01-11 22:13:38 +00:00
Alex Johnston
c9525365c3 [automerger skipped] Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d am: d8124d47f0 am: 3fd5e0f7f8 -s ours am: d60558861a -s ours
am skip reason: Merged-In I7c23442e143a6d74935945e6f5e4ce5ce0ef77f0 with SHA-1 04c66a0a3c is already in history

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

Change-Id: I09e4b00f3348bbb6ba06eead607361e7b17114da
2022-01-11 22:12:15 +00:00
Alex Johnston
d567862732 [automerger skipped] Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d am: d8124d47f0 -s ours am: ca8073159b -s ours
am skip reason: Merged-In I7c23442e143a6d74935945e6f5e4ce5ce0ef77f0 with SHA-1 04c66a0a3c is already in history

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

Change-Id: I76f9f974a5a95e34dba21612044577a4d0533d26
2022-01-11 21:51:36 +00:00
Alex Johnston
d60558861a [automerger skipped] Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d am: d8124d47f0 am: 3fd5e0f7f8 -s ours
am skip reason: Merged-In I7c23442e143a6d74935945e6f5e4ce5ce0ef77f0 with SHA-1 04c66a0a3c is already in history

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

Change-Id: I1db904751a2cfa6671c587a816089d825871506e
2022-01-11 21:50:53 +00:00
Alex Johnston
3fd5e0f7f8 Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d am: d8124d47f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16551092

Change-Id: Ia028b11274420bec314c22f967f0d7cbe0e88570
2022-01-11 21:33:10 +00:00
Alex Johnston
ca8073159b [automerger skipped] Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d am: d8124d47f0 -s ours
am skip reason: Merged-In I7c23442e143a6d74935945e6f5e4ce5ce0ef77f0 with SHA-1 04c66a0a3c is already in history

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

Change-Id: Idb19d10a976088c5a0d7bbbefe4f01a53264b0a4
2022-01-11 21:33:08 +00:00
Alex Johnston
f65be399e4 Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d am: 7bf45c4006
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16551092

Change-Id: Ic1fd7ed10b52cf2d37b3c1ca9a14dde3649bfcad
2022-01-11 21:26:02 +00:00
Alex Johnston
53ffad4bcc Merge "Add non system overlay flag to RequestManageCredentials" into sc-v2-dev am: 3ab85fbd60 am: 15c5e404bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414974

Change-Id: I24d5979f4673badf9eaa850556ab3c22b459c5d7
2022-01-11 21:25:53 +00:00
Alex Johnston
d8124d47f0 Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16551092

Change-Id: Ifbce4430f251b7b152538520f318e62900ea64b0
2022-01-11 21:09:59 +00:00
Alex Johnston
15c5e404bf Merge "Add non system overlay flag to RequestManageCredentials" into sc-v2-dev am: 3ab85fbd60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414974

Change-Id: I711098bc2c2fb999ae5841d60ea8b948791d28f1
2022-01-11 21:08:52 +00:00
Alex Johnston
7bf45c4006 Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16551092

Change-Id: I2a1621fcddeded97c93ef41e809a7c60f13f7235
2022-01-11 21:08:42 +00:00
Alex Johnston
ff07f8c34d Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev 2022-01-11 20:47:35 +00:00