Joe Bolinger
72885506b4
Merge "Add userId parameter to all uses of challenge in settings." into sc-dev am: 93f6a257e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14472474
Change-Id: I2208e5f953a485aaa1d00d8d168b009269b65c9a
2021-05-12 01:30:17 +00:00
Joe Bolinger
93f6a257e9
Merge "Add userId parameter to all uses of challenge in settings." into sc-dev
2021-05-12 01:25:39 +00:00
menghanli
1949a5d69f
[Material Next] Move “main switch” right below illustration
...
Bug: 187688296
Test: Manual testing
Change-Id: Ic36b6deaad410fce49dcc19861a11307fb479f55
2021-05-12 00:56:50 +00:00
Kevin Han
53aaab09b8
Fix "X unused apps" string to match w/ unused apps
...
This fixes an issue where there is some discrepancy between the "X
unused apps" string in Settings and the actual number of unused apps in
PermissionController due to the Settings logic not taking into account
the usage time.
Bug: 187464720
Test: atest HibernatedAppsPreferenceControllerTest
Test: hibernate app and revoke permission, open app, number of unused
apps matches up
Change-Id: Ifc30280e582e4183c61d421dd5378d627a80baf9
2021-05-11 17:04:55 -07:00
Hai Zhang
1a50cec60a
Merge "Don't add SettingsLib to static_libs in Settings unit test." into sc-dev am: 8a7f55246f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491512
Change-Id: I3f4472878de17742fe6c5f2fb697cc5693b1af60
2021-05-11 22:55:07 +00:00
Hai Zhang
23055a10a7
Merge "Don't add SettingsLib to static_libs in Settings unit test." into sc-dev am: 8a7f55246f am: e3f92d924d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491512
Change-Id: I7c634d792342515fe8d0a7125440769602ad9b33
2021-05-11 22:50:14 +00:00
Hai Zhang
e3f92d924d
Merge "Don't add SettingsLib to static_libs in Settings unit test." into sc-dev am: 8a7f55246f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491512
Change-Id: I3e9df6b5be13919be4e580cc3b7442060e4265ac
2021-05-11 22:49:38 +00:00
Hai Zhang
8a7f55246f
Merge "Don't add SettingsLib to static_libs in Settings unit test." into sc-dev
2021-05-11 22:44:09 +00:00
Kevin Chyn
219b919ba5
Update fingerprint introduction "Keep in mind" section
...
Bug: 187068239
Test: manual
Change-Id: I203f1c52c50dea9cfb1045726f3f2bb4b04435ff
2021-05-11 14:27:51 -07:00
Julia Reynolds
748b61ce2e
Fix NPE on guest user
...
Test: RoboTests
Fixes: 187548511
Change-Id: I86219bc5e2cf285fcc86f5c8456d7d2afcbe2c0f
2021-05-11 15:08:57 -04:00
Julia Reynolds
fef73ef82a
Don't show DND access settings in managed users
...
Test: launch direct intent in a managed user
Fixes: 187304252
Change-Id: I1cfcf8c147fc47b4e2fb2a725cba9846e4f09055
2021-05-11 16:35:42 +00:00
Hugh Chen
c556938807
RESTRICT AUTOMERGE Fix unable to send file via OPP
...
Bluetooth app will indicate BluetoothOppReceiver to receive
device picker intent. But for fix the security issue we
removed the setClassName() method in ag/14111132 to avoid attack.
It causes BluetoothOppReceiver cannot receive the intent.
This CL will compare to calling package name with launch package name.
If they are not equal, the setClassName() will not invoke.
Bug: 186490534
Bug: 179386960
Bug: 179386068
Test: make RunSettingsRoboTests -j56
Change-Id: Ia51528f2a44ab73edbc86899ca0846d3262fe1f0
(cherry picked from commit bb5be240c0 )
2021-05-11 15:45:18 +00:00
TreeHugger Robot
05c76c0e44
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9d3c9dd867 -s ours am: cefbb1d83a -s ours am: 82c1e0ae12 -s ours am: 9b2cecdd05 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491515
Change-Id: I6cd6f9addcd93d29bf9a423ee5683a6ddfd7680f
2021-05-11 15:37:19 +00:00
TreeHugger Robot
a0f2972d87
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 842c67d794 -s ours am: 84ed78af0a -s ours am: d1625e0793 -s ours am: c664eb135c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14498657
Change-Id: Icfec38990ff0e72e5d26031e63957feac3985963
2021-05-11 15:37:14 +00:00
TreeHugger Robot
6b9a23b8f3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e81db4e2f0 -s ours am: 647e0ee2ad -s ours am: 3ac61d217a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491513
Change-Id: I86830b27622cbf8b1dc689b370fbf639783bf3b6
2021-05-11 15:37:09 +00:00
TreeHugger Robot
8dbdb07e04
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 860318bab8 -s ours am: 2231cba3d1 -s ours am: ea888d7275 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491514
Change-Id: I707551739dedfc1f44281fe8c08f3d2a43d76b69
2021-05-11 15:36:34 +00:00
TreeHugger Robot
9b2cecdd05
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9d3c9dd867 -s ours am: cefbb1d83a -s ours am: 82c1e0ae12 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491515
Change-Id: I40a2159c541eecce401a6cafcd819f72d5df8c06
2021-05-11 15:07:07 +00:00
TreeHugger Robot
c664eb135c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 842c67d794 -s ours am: 84ed78af0a -s ours am: d1625e0793 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14498657
Change-Id: Ie8ff3cd39d0838d8c13df910c3e05199512cd066
2021-05-11 15:07:03 +00:00
TreeHugger Robot
3ac61d217a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e81db4e2f0 -s ours am: 647e0ee2ad -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491513
Change-Id: I3d29a4d40bb3e57fbf49b70b760640087b736260
2021-05-11 15:06:52 +00:00
TreeHugger Robot
ea888d7275
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 860318bab8 -s ours am: 2231cba3d1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491514
Change-Id: Ie9b3bc81d20a1708291b76b627cdefc1be078676
2021-05-11 15:06:27 +00:00
TreeHugger Robot
31873d44f7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9d3c9dd867 -s ours am: cefbb1d83a -s ours am: 82c1e0ae12 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491515
Change-Id: I9472b98e45e99eaf6ef87ea45015bd74d7224109
2021-05-11 15:05:06 +00:00
TreeHugger Robot
cc4d77afe4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 842c67d794 -s ours am: 84ed78af0a -s ours am: d1625e0793 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14498657
Change-Id: Ia2201c405daaec0590272ed7f5e69b895da10d8b
2021-05-11 15:05:02 +00:00
TreeHugger Robot
fc21d04c07
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e81db4e2f0 -s ours am: 647e0ee2ad -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491513
Change-Id: I0bb4f8d01e76e7b2c2cc707f2ba59f64b6072140
2021-05-11 15:04:51 +00:00
TreeHugger Robot
dc546a21f5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 860318bab8 -s ours am: 2231cba3d1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491514
Change-Id: I6220ce32b9909330d9fa94b0da865371a7429a71
2021-05-11 15:04:09 +00:00
TreeHugger Robot
82c1e0ae12
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9d3c9dd867 -s ours am: cefbb1d83a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491515
Change-Id: Ifaad1baedb515d91ef2d899059dabbfd5b2ae291
2021-05-11 14:50:10 +00:00
TreeHugger Robot
d1625e0793
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 842c67d794 -s ours am: 84ed78af0a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14498657
Change-Id: I189470dc12111e6ddb088611a94419485e266231
2021-05-11 14:50:06 +00:00
TreeHugger Robot
647e0ee2ad
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e81db4e2f0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491513
Change-Id: Ic234fd718791b2790665336914b24c0b6f63c957
2021-05-11 14:49:26 +00:00
TreeHugger Robot
2231cba3d1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 860318bab8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491514
Change-Id: I2204c47b4e3e25cd42fd35aff1bbad56514d39a8
2021-05-11 14:49:20 +00:00
TreeHugger Robot
5625e4b302
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3772f9137a -s ours am: 2da86a6163 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14498659
Change-Id: I096999a06b89d5b62b98dae0fe49ee500b078a1c
2021-05-11 14:48:35 +00:00
TreeHugger Robot
ed056a81f1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 126fc5b912 -s ours am: 4e5a16a7d3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14500796
Change-Id: I4130b3637dbc5a404d2611c4b8324037501bee4f
2021-05-11 14:48:30 +00:00
ykhung
1422ab8a4c
Refine graph top margin and expand/collapse icon theme color am: 525659c291 am: 8febb17220
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493692
Change-Id: I5e80b84bf0cfe7b085119a8a2ece1b5fe14bfc2e
2021-05-11 14:48:19 +00:00
TreeHugger Robot
e81db4e2f0
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-05-11 14:35:46 +00:00
TreeHugger Robot
2da86a6163
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3772f9137a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14498659
Change-Id: Icd3e8bf11cb721b29e66cce799a0670f1c90a50f
2021-05-11 14:32:53 +00:00
TreeHugger Robot
4e5a16a7d3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 126fc5b912 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14500796
Change-Id: If725b62001c4de8538c44c69d26dd45f8eda4934
2021-05-11 14:32:43 +00:00
TreeHugger Robot
860318bab8
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-05-11 14:31:55 +00:00
TreeHugger Robot
55b8fb0e3a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3772f9137a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14498659
Change-Id: I9fa04958878b44d9e96b1bb4d0f63347db10977b
2021-05-11 14:30:55 +00:00
TreeHugger Robot
cefbb1d83a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9d3c9dd867 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491515
Change-Id: I402572a820a93daf549d86a3345d3d861205d302
2021-05-11 14:30:51 +00:00
TreeHugger Robot
84ed78af0a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 842c67d794 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14498657
Change-Id: Ife34138bc4382a1f63098546ffa67047d6a8e9c5
2021-05-11 14:30:44 +00:00
TreeHugger Robot
3d64580531
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 126fc5b912 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14500796
Change-Id: Ie856a3f0b3b52d4ff5a5c40dbf9916bbed0d741f
2021-05-11 14:30:42 +00:00
TreeHugger Robot
9d3c9dd867
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-05-11 14:17:52 +00:00
TreeHugger Robot
842c67d794
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-05-11 14:17:11 +00:00
TreeHugger Robot
3772f9137a
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-05-11 14:16:42 +00:00
TreeHugger Robot
126fc5b912
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-05-11 14:10:55 +00:00
Wesley.CW Wang
c0fe8f2246
Update battery state string
...
- Update battery saver state string
- Update app usage active time string
Bug: 187779948
Bug: 187778616
Test: make SettingsRoboTests
Change-Id: Ifc4e5528f0f2d17c0461a83f250fb9c4acba042d
2021-05-11 12:12:30 +00:00
Arc Wang
543068210f
Implements profile selection tab in Storage Settings
...
- StorageDashboardFragment and StorageItemPreferenceController works only
for one profile per instance.
- StorageAsyncLoader loads for all users(profiles) and regards each user independent.
- SecondaryUserController will not load personal profile user in work profile tab.
- Cleanup some unused profile related files.
Bug: 174964885
Test: atest com.android.settings.deviceinfo
atest com.android.settings.deviceinfo.storage
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo.storage
Change-Id: I8361c29bc240c519c7261b19522c41439479c1c2
Merged-In: I8361c29bc240c519c7261b19522c41439479c1c2
2021-05-11 20:00:08 +08:00
Hai Zhang
6bf47f6274
Don't add SettingsLib to static_libs in Settings unit test.
...
Adding them results in duplicate classes and causes conflict for the R
classes and resource loading.
Meanwhile, correctly removing the SettingsLibSettingsSpinner resulted
in the test failing to find the getSelectedItem() method which is
unused inside Settings app. This is an inherent issue when unit
testing an optimized (and shrunk) app, and since there's no other way
for the test to get the current selected item, this change simply
changes the Settings code to invoke getSelectedItem() as well. This
has exactly the same effect because SettingsSpinnerPreference updates
its mPosition right before calling the OnItemSelectedListener in its
implementation.
Bug: 183340630
Bug: 177638625
Bug: 183342958
Test: atest SettingsSliderPreferenceControllerTest
Test: atest PrivateVolumeForgetTest
Change-Id: Ia26ca923369b41291614fb9bd50dfbd2aac2f0fa
2021-05-11 03:33:08 -07:00
Arc Wang
65d3f45606
Set storage volume spinner not clickable when only 1 volume
...
Bug: 187801712
Test: manual
Click the spinner when there is only default volume.
Click the spinner when there is USB drive connected.
Change-Id: Ifbd26c96f467757ffcfef750bd80533834123f82
2021-05-11 18:06:47 +08:00
ykhung
8febb17220
Refine graph top margin and expand/collapse icon theme color am: 525659c291
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493692
Change-Id: I96b4ba0c2504045c7c04905ac4e9bf27f1b32a3c
2021-05-11 09:25:51 +00:00
ykhung
97b64f8d72
Refine graph top margin and expand/collapse icon theme color am: 525659c291
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493692
Change-Id: I4ebdbea1011f354fb8023f8ad1219407eb2d0f9c
2021-05-11 09:21:53 +00:00
Bill Yi
7218ff4ef6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0e280f8e60612add9cd19a47b4b01ac40d827977
2021-05-11 09:08:53 +00:00