Julia Reynolds
ebefd615d8
Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118
Change-Id: I910d0976c26d0e1df0760e75b8c3117d36afd892
2021-06-25 16:29:45 +00:00
Zimuzo Ezeozue
73c1c1017c
Merge "Update string to enable transcode via MTP" into sc-dev am: 17608ff21a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15095781
Change-Id: Ief22b91b41b4ae0d44bc8ec20560800132bdd712
2021-06-25 16:29:18 +00:00
Wendy Sung
1d909e6649
Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev am: 29da5abcb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056868
Change-Id: I4bd718dfdc506824e5e9ff96e5218cf433408804
2021-06-25 16:28:22 +00:00
Rajeev Kumar
2381645bda
Merge "Make use of config for auto-created guest users" into sc-dev am: f11fdb3e50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14988090
Change-Id: I13f62a014f6f300a8d5aa9b69d47760cff3896de
2021-06-25 16:25:33 +00:00
Julia Reynolds
3d22e9775a
Merge "Disable additional pkgs on DND perm page" into sc-dev
2021-06-25 14:56:13 +00:00
Julia Reynolds
4c7981eb0d
Disable additional pkgs on DND perm page
...
Because they will always have access because they hold
the permission to manage notifications.
Test: manual
Fixes: 191973668
Change-Id: I456aec41b401bba6f10d9ea969e2fb8c4300825d
2021-06-25 09:17:41 -04:00
Zimuzo Ezeozue
17608ff21a
Merge "Update string to enable transcode via MTP" into sc-dev
2021-06-25 08:24:27 +00:00
Wendy Sung
29da5abcb1
Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev
2021-06-25 03:22:41 +00:00
Rajeev Kumar
f11fdb3e50
Merge "Make use of config for auto-created guest users" into sc-dev
2021-06-25 03:15:35 +00:00
Bonian Chen
d2e5971ed1
Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev am: f9aa12f4d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102531
Change-Id: Id38b8ee7895c18dd8211f7b4caf0d307c924f1d0
2021-06-25 02:18:37 +00:00
Bonian Chen
0363e192c1
Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev am: 97886470cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076791
Change-Id: I238d3465742a9998da4553b644299c655b997710
2021-06-25 02:18:12 +00:00
Bonian Chen
f9aa12f4d9
Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev
2021-06-25 02:17:59 +00:00
Bonian Chen
7b8e05adab
Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"
...
This reverts commit 2a1344a50e
.
Reason for revert: Missing some files which would lead to build breakage.
Change-Id: I8c63dea9b41598b563cbf5e5ff1c500cc51b7005
2021-06-25 02:10:43 +00:00
Bonian Chen
97886470cb
Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev
2021-06-25 01:59:05 +00:00
Peter Kalauskas
8d37a2bb85
Make use of config for auto-created guest users
...
If frameworks config config_guestUserAutoCreated=true, then Settings
will:
- Create a new guest user any time the current guest user is removed
- Show "Guest" instead of "Add guest"
- Show "Reset guest" instead of "Remove guest"
Bug: 188542158
Test: With config_guestUserAutoCreated=true, delete current guest user
using adb (`adb shell cmd user list -v --all` to find the user
ids, then remove each guest user with `adb shell pm remove-user
<id>`), then as owner, open multi-users settings page. Check that
there is a item for "Guest" instead of "Add guest". Select
"Guest", then confirm there is an item for "Reset guest" (it
should be disabled). Select "Switch to guest", then switch back to
owner. Open the multi-users settings page again. Check that "Reset
guest" is now enabled. Tap "Reset guest", and press confirmation
button, named "Reset". You should be take back to the main
multi-user settings page and still see "Guest". Wait a few
seconds, then use adb to confirm there is a guest user present.
Test: With config_guestUserAutoCreated=true, switch to guest user, open
multi-users settings page, check that there is an option to "Reset
guest". Select "Reset guest", and press confirmation button, named
"Reset". Phone should switch back to last active user, and QS tile
should now show "Guest" instead of "Add guest". Run `adb shell cmd
user list -v --all` to confirm guest has a new user id.
Test: With config_guestUserAutoCreated=false, confirm that "Add guest"
and "Remove guest" features remain unchanged
Change-Id: I7d5b81bd2e5c6b999ae18cd6b1280ae0496db94b
2021-06-24 17:40:12 -07:00
TreeHugger Robot
6225c4a3af
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54c1ff8489
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092782
Change-Id: I573848bc5bd6cfd18ae7e73fe2b2679dc155261a
2021-06-24 20:42:25 +00:00
TreeHugger Robot
54c1ff8489
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-24 20:25:56 +00:00
TreeHugger Robot
510d842992
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7
-s ours am: b8bd54cd94
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092772
Change-Id: I48915126bede1c00e53af1f9f85414a9fb7f6034
2021-06-24 20:15:26 +00:00
Bill Yi
6ace7cdcb2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f
-s ours am: 3e45d30cfb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092774
Change-Id: Iebc27f5c780f1483cc216fde9ec712a2bd4f1066
2021-06-24 20:15:22 +00:00
TreeHugger Robot
cb3096af34
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0
-s ours am: 0e1287502f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092777
Change-Id: Ic835ded7c7cf0409344720eb663153b6a6df1b6c
2021-06-24 20:15:18 +00:00
Bill Yi
3716c2a75f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851
-s ours am: 06ffb62957
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092776
Change-Id: Iecb99258b8a0a0acbefbabb11d17b8a8b4d1cf16
2021-06-24 20:15:14 +00:00
TreeHugger Robot
2ac3bc7a2a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092779
Change-Id: I1fcb35daec8ac19969b6181411407ae1b391ff95
2021-06-24 20:15:05 +00:00
TreeHugger Robot
b8bd54cd94
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092772
Change-Id: I157969d7a1a3f3b5cab29f3e9ecec9e3c89dba92
2021-06-24 20:14:39 +00:00
Bill Yi
3e45d30cfb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092774
Change-Id: Ie9e55bbaf2f5d03312deca10c09c21658eb7fb2d
2021-06-24 20:14:30 +00:00
TreeHugger Robot
0e1287502f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092777
Change-Id: Iaea10d18ec08b69975f0f172e3b1fc282f8db64a
2021-06-24 20:14:05 +00:00
Bill Yi
06ffb62957
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092776
Change-Id: Ic10837a5f31ad798d1b9d43cadf6eb52300e4975
2021-06-24 20:14:00 +00:00
TreeHugger Robot
483f978ba7
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-06-24 20:02:41 +00:00
TreeHugger Robot
fa6b455bd0
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-06-24 19:58:49 +00:00
TreeHugger Robot
edeef947e4
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-24 19:56:59 +00:00
TreeHugger Robot
ca62b8d0aa
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-24 19:51:09 +00:00
TreeHugger Robot
f0708e90f6
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-24 19:48:40 +00:00
Zim
6699b47f77
Update string to enable transcode via MTP
...
Also added a summary string when checked.
Test: Manual
Bug: 191985287
Change-Id: I1db9763bbf3766eecace6eca168218ab71ca6195
2021-06-24 20:13:08 +01:00
TreeHugger Robot
15e4ca6442
Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859
Change-Id: Ica9979965368a4aa9c42931441729290b6bd174b
2021-06-24 18:32:57 +00:00
TreeHugger Robot
dda37a3500
Merge "Updated fingerprint bad calibration string" into sc-dev
2021-06-24 18:12:11 +00:00
Curtis Belmonte
911fc6569b
Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245
Change-Id: I8dbc2baf032d6d4dc7af46a80775d33fb7572928
2021-06-24 17:59:01 +00:00
Curtis Belmonte
4de89a9361
Merge "Use correct string for Face Unlock preference category" into sc-dev
2021-06-24 17:47:14 +00:00
Bill Yi
ae7989d729
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic0b8647c8319e2389b3e8bf0bf90edcfc9935d25
2021-06-24 15:51:28 +00:00
Bill Yi
e93a98e06b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I95f8f317ddf4f40de75a9d7171960ca430dc0cd9
2021-06-24 15:47:17 +00:00
Bill Yi
d1c25e8dfe
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I62eace4a91508f8f27ab37d4cb9a464ba6417f4c
2021-06-24 15:39:29 +00:00
Bill Yi
a83bc881f6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib99ff0cca771e011eb4c7c01e741b47a6ff57724
2021-06-24 15:37:57 +00:00
Bill Yi
1ff9267e5a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idda50c4476939eb34180e330eb2d8ffc1ceebafe
2021-06-24 15:33:28 +00:00
Bill Yi
342b2ae851
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic8d9a3522550591b80fc7cd8470d939c324443ef
2021-06-24 15:29:50 +00:00
Quang Luong
f151a04d43
Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404
Change-Id: Ibe201c94dadde5ac0498246a3d48d501a720e0b4
2021-06-24 15:27:38 +00:00
Bill Yi
8198514a9f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I94d39b7145cec9ac42f49e6debb051cfe5fa59c6
2021-06-24 15:20:40 +00:00
Bill Yi
a6df60ab6b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifff56e70e67db8993c9fd789cdb86c471172329e
2021-06-24 15:15:22 +00:00
Quang Luong
afc0bd763c
Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev
2021-06-24 15:12:38 +00:00
Jeff Sharkey
cf5988db8a
Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071
Change-Id: Ia670fbf2a906638019087cddda098d8c5a40e33b
2021-06-24 15:02:11 +00:00
Jeff Sharkey
5b7518fdf7
Merge "Update to modern Bluetooth permissions." into sc-dev
2021-06-24 14:44:28 +00:00
Wesley Wang
faa0004d16
Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550
Change-Id: Ifb2252f56faaa9f04a6fef2095fed8021272e115
2021-06-24 13:57:54 +00:00
Wesley Wang
31428e9dc5
Merge "Remove unnecessary converting us to ms" into sc-dev
2021-06-24 13:45:16 +00:00