Yi Jiang
c5240330fb
Merge "Fixes UI style issues in Screen Timeout setting" into sc-dev am: 5c11109ffc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13828187
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4171acbe3d433a5be7978fae1d9c8d36b6fb5407
2021-03-11 05:13:55 +00:00
Yi Jiang
5c11109ffc
Merge "Fixes UI style issues in Screen Timeout setting" into sc-dev
2021-03-11 04:48:04 +00:00
Arc Wang
3b4853e109
Hide non-system overlay window on ActivityPicker
...
To improve security.
Bug: 181962311
Test: manual
Show an AlertDialog and observe if it will hide after below command.
adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I6e2845cc19dc012cba2933318a067bbb8db90a23
2021-03-11 12:10:18 +08:00
Treehugger Robot
d93df9f4d3
Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f am: eda1be644f am: 2817c677b1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie5e51949f4aef78f1d4c7beb79b40b311c3f1ab1
2021-03-11 03:56:29 +00:00
Treehugger Robot
2817c677b1
Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f am: eda1be644f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I755a0f00c44dfd39b84e4f843a1553de2e8850a2
2021-03-11 03:23:22 +00:00
Treehugger Robot
eda1be644f
Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I80ebc15814491a28b3da23b6554b81022ab49db3
2021-03-11 02:41:39 +00:00
Kevin Chyn
f8cb470bdf
Merge changes from topics "fp-revokeChallenge", "new-revokeChallenge" into sc-dev am: 13b05b6fb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13820985
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ife8335f1b85e773b7f6cb2bd567d7b8657ae000a
2021-03-11 01:49:40 +00:00
Kevin Chyn
ae931bf46f
Update revokeChallenge together with frameworks/base am: e91e39b604
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13818078
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4e624f56b1b653034bb4ebb48fd09564a7099305
2021-03-11 01:49:37 +00:00
Kevin Chyn
13b05b6fb8
Merge changes from topics "fp-revokeChallenge", "new-revokeChallenge" into sc-dev
...
* changes:
Update fingerprint revokeChallenge with frameworks/base
Update revokeChallenge together with frameworks/base
2021-03-11 01:14:15 +00:00
Treehugger Robot
dac69ccd8f
Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I74024fbb550f8c405f2850bd20b90599370b0bad
2021-03-11 00:58:01 +00:00
Sooraj Sasindran
1ce8eb765a
update isCrossSimCallingEnabledByUser name
...
update isCrossSimCallingEnabledByUser name to
isCrossSimCallingEnabled
Bug: 179143945
Test: build
Change-Id: I8bb0196cc04dc437ed709548ecd569c4dd7828a1
2021-03-10 16:43:49 -08:00
Abel Tesfaye
77540067da
Merge "Update autorotate search terms" into sc-dev am: bf182903ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13818585
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I73be6864df6c43bccf9f61872a47e9bc38ffc602
2021-03-11 00:27:09 +00:00
Andras Kloczl
6746add669
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:16:46 +00:00
Andras Kloczl
9c0024f455
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:16:03 +00:00
Andras Kloczl
e0f8214e80
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:15:46 +00:00
Andras Kloczl
798bdd90b0
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:15:27 +00:00
Andras Kloczl
e36357b20c
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:14:59 +00:00
Andras Kloczl
07e414017c
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:13:05 +00:00
jasonwshsu
ffe8521b9f
Add seekBar properties 'tickMark' to LabeledSeekBarPreference
...
Bug: 173940869
Test: manual
Change-Id: I135e52181bdb86ded6187a3fa30b9cffeb69d451
(cherry picked from commit 9584ba6b57 )
2021-03-10 23:34:26 +00:00
Abel Tesfaye
bf182903ed
Merge "Update autorotate search terms" into sc-dev
2021-03-10 23:25:37 +00:00
Treehugger Robot
e9dff191b0
Merge "Update src/com/android/settings/inputmethod/OWNERS"
2021-03-10 23:05:57 +00:00
Yi Jiang
01f1c660a0
Fixes UI style issues in Screen Timeout setting
...
1. Remove help url and search icon.
2. Uses BannerMessage for permission missing notification.
Test: manual
Bug: 182297705
Change-Id: Id4dc998d7276f4c4f7593b1b0312d92097ec83cf
2021-03-10 12:58:46 -08:00
Ahaan Ugale
1e45409e76
Merge "AF: Unit tests for PasswordsPreferenceController." into sc-dev am: e9355553ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13797113
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I41121bfe174a5e644ba5a70c0be32fa034c07ff6
2021-03-10 20:16:23 +00:00
Ahaan Ugale
e9355553ee
Merge "AF: Unit tests for PasswordsPreferenceController." into sc-dev
2021-03-10 20:08:08 +00:00
Yohei Yukawa
5878a77218
Update src/com/android/settings/inputmethod/OWNERS
...
Let's update this legacy OWNERS file based on the current reality.
Hopefully this would make it easier for contributers to find available
owner reviewers.
Fix: 182385491
Test: n/a
Change-Id: If47b5c0b83d561dceacc58c8fbd3643524432d62
2021-03-10 10:37:51 -08:00
Mill Chen
0023100e7f
Declare activities for factory reset pages
...
When trying to trigger factory reset from Settings app, it's unexpected
that Settings will get a fatal ActivityNotFoundException, causing
Settings crash. The factory reset pages have changed their launching
way from by SubSettingsLauncher to by startActivity directly. These
activities haven't been declared in AndroidManifest.xml, which caused
this issue.
Fixes: 182144129
Test: rebuild and manual
1) Flash the device with aosp build
2) Navigate to Reset options (Settings -> System -> Reset options)
3) Observe and check if Settings gets crashed
Change-Id: Ia99f269e237d7c84153d4b903cbca14c33835dc1
2021-03-11 01:39:03 +08:00
TreeHugger Robot
32572a2f87
Merge "Prevent a larger title from displaying incompletely" into sc-dev am: 8c6564b67e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815932
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1319c41ed6572319a91fec78cdf3d4d199513da5
2021-03-10 16:00:52 +00:00
Yanting Yang
7c0a4c3920
Merge "Update metrics category for new app page" into sc-dev am: 16b6910b7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13806594
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4ec50247dee5d27ae0e9e2a19dcab480dc2bf715
2021-03-10 15:58:36 +00:00
TreeHugger Robot
cf6f531b75
Merge "[Provider Model] Add Wi-Fi toggle slice" into sc-dev am: 38e19abdf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13805366
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie1f083a1c9c7094477ff76501213e1db982d4016
2021-03-10 15:45:14 +00:00
Salud Lemus
9a91b3970b
Merge "Remove default admin support message for an Enterprise device" into sc-dev am: b687a9757c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13810347
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I241fcb7ac0be3de7d7bfd177a9c8d6c1e277792f
2021-03-10 15:44:19 +00:00
TreeHugger Robot
4316e21bc0
Merge "Implement temporary asset in settings page" into sc-dev am: 48f6ec410e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774725
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0aa7809c33264289cce74b4dabc46a9f567136b4
2021-03-10 15:42:59 +00:00
Abel Tesfaye
8fda5e167b
Merge "Fix for NPE in ScreenTimeoutSettingsTest" into sc-dev am: e604c56241
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13777300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4b7926a58d6c0f2aefe60f5a74dbeb6c72493eba
2021-03-10 15:18:45 +00:00
Ahaan Ugale
5f60cdeb3a
Merge "Use androidx LifecycleObserver for wiring up controller lifecycles." into sc-dev am: c21337d44f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13804075
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib73f27f861da5f6b18484ab430df2b38297bcc44
2021-03-10 14:59:43 +00:00
Ahaan Ugale
3fe039ae35
Merge "Add javadoc about lifecycles for xml defined Controllers." into sc-dev am: b4b0207e09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13804074
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9a3efa10ba147bdf37f1a2ee41c74662ef322241
2021-03-10 14:59:41 +00:00
Victoria Lestari
8ffad14abe
Merge "Revert "Revert "VoiceInputHelper should not show recognition service if it's not selectable as default""" into sc-dev am: f760ea0639
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13785874
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7e4d9578ecd26d2d6e741503835bf9030c918726
2021-03-10 14:45:04 +00:00
Weng Su
6a0ef56917
[Provider Model] Adjust slice title and subtitle
...
- Show "Airplane mode" title when airplane mode is enabled
- Remove "Airplane mode is on" subtitle
- Show "Wi-Fi is turned on" subtitle when both airplane mode and Wi-Fi
is enabled
- Remove the function related to isApmNetworksAvailable()
- Screenshot:
https://screenshot.googleplex.com/6X9nzmXRCUfw4Lp
https://screenshot.googleplex.com/6jQryMjU2yDDpmM
Bug: 181858434
Test: manual test
atest -c InternetConnectivityPanelTest \
InternetPreferenceControllerTest \
InternetUpdaterTest
Change-Id: I84e5d4c60ed91d58443b27c35286a84bf72ac173
2021-03-10 22:34:35 +08:00
Zoey Chen
e6532c41d1
[automerger skipped] Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" am: 9abf2bff3b am: 6003cb977f am: 9988792138 -s ours am: 0872d40a75 -s ours
...
am skip reason: Change-Id I52af54045872bbf13e64d5d94c8b027ec702abb9 with SHA-1 ea29704e40 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620520
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib3db8596631fe30f0b4956613526acc9f728ebe8
2021-03-10 14:06:01 +00:00
TreeHugger Robot
8de08d26da
Merge "Fix the broken test on NetworkProviderSettingsTest" into sc-dev am: be1b2f307d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13805542
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib2938fc59e94aee8b1530d0d582eab9efac1e761
2021-03-10 14:04:52 +00:00
TreeHugger Robot
aef33faecd
Merge "Prevent app bar title from drawing twice" into sc-dev am: 50129cc4db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13812555
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I039672dcf9ba137de488662cdaf963cc195ee2e1
2021-03-10 14:04:47 +00:00
TreeHugger Robot
4895c08f6e
Merge "Change ScrollView to NestedScrollView for wifi_dialog" into sc-dev am: 3dacd0209c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13812549
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I46a82f001837aeadc4482dc3c5165581d5067dbc
2021-03-10 14:04:39 +00:00
TreeHugger Robot
9ffa922a81
Merge "Update fingerprint layouts for landscape" into sc-dev am: 6ef1bc7336
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13806600
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaa7dd88aa23ac96e00472430c78180f9bdb2802b
2021-03-10 13:47:40 +00:00
Edgar Wang
764f86e6e3
Merge "Refactor MainSwitchBar" into sc-dev am: 3f051ac871
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13566507
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I95440e5224d9f089ef712d6c9bbf672e63e18867
2021-03-10 13:31:13 +00:00
TreeHugger Robot
00fd3140d9
Merge "Move injected services for work into a new page" into sc-dev am: 3b477b13e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13791190
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I13c3f62a376d1a6296a1f4edb92d08e1245169e5
2021-03-10 13:31:04 +00:00
TreeHugger Robot
ac81149283
Merge "Add "See All" page for Recent Location Access" into sc-dev am: f605777f10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13775472
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie5cd287f55a066d4f659c75b52bbf178874bcc6e
2021-03-10 13:30:54 +00:00
Paul Hu
ff9a14ee9b
Merge "Update Utils#getTetheringLabel usage on Settings" into sc-dev am: e5e60115db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13794937
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I738284f26afea3c2773d95efafadfe6d9b1180a9
2021-03-10 13:14:16 +00:00
TreeHugger Robot
72e2196eac
Merge "Fix battery level of earbuds bt devices is inconsistent" into sc-dev am: 6535fe00c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13805368
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I54f0952dfd9ba31e9f734cfca9ef043532d14d89
2021-03-10 13:14:08 +00:00
Kevin Chyn
6146f860dc
Merge "Do not re-start fingerprint auth if ERROR_USER_CANCELED" into sc-dev am: 5dca77291b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13792643
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iab03e2d8af40c7ae9adb8d8c4dd862a144b3efa6
2021-03-10 13:13:10 +00:00
Alex Salo
7e839d0ad3
Merge "Fix long press auto rotate implementation bug" into sc-dev am: 8bfbd34662
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13775970
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I23f61e90877fed4545ee62742c984ac084880a5f
2021-03-10 13:11:33 +00:00
Michael Wachenschwanz
860b6272f9
Merge "Update FakeUid with energy to charge change" into sc-dev am: 8625648a88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13598823
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4a086d7022d0be64281281bf934310fcba339933
2021-03-10 13:11:18 +00:00
Salud Lemus
70d465b284
Merge "Update Action Not Allowed Dialog text for a financed device" into sc-dev am: 50527b1f63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13733826
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I80c350ff2dd1bdc453154d04fb73c493a63e04f0
2021-03-10 13:11:10 +00:00