Commit Graph

77692 Commits

Author SHA1 Message Date
TreeHugger Robot
1a09d244d4 Merge "Hide 'View plan' button in data usage settings" into rvc-qpr-dev 2020-10-16 22:18:33 +00:00
Kevin Chyn
3b6410c92b Fix biometric string
Fixes: 169163181

Test: Builds
Change-Id: I8ae5cdc32957fa63849213fb04f10c8fb2e00211
2020-10-16 12:47:30 -07:00
Amit Mahajan
ab342760ad Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47 am: b09f09b02d am: 0e5fdb184d am: 0f36371e3e am: 45435fdb1d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: Iafe645fb6907b7836400c6f7ea413a396bdff5e2
2020-10-16 08:17:18 +00:00
Hugh Chen
3a7293cbbf Fix output switcher will show 2 media session in some use cases
Before this CL, we didn't check whether the remote session existed
in the list before. If priority of remote session is higher than
local session, it causes us to return the local session even if
the list has a remote session.

This CL uses a list to cache package names of remote sessions.
If the local session has the same package name of the remote session
then don't return the local session.

Bug: 169052790
Test: make -j42 RunSettingsRoboTests
Change-Id: I2726a3deb397f646e4c74a8c445dde6fafb694a8
2020-10-16 16:08:48 +08:00
Amit Mahajan
45435fdb1d Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47 am: b09f09b02d am: 0e5fdb184d am: 0f36371e3e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: I8f902653e404ad89c09189b29469c9b599efcf05
2020-10-16 08:04:11 +00:00
Amit Mahajan
0f36371e3e Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47 am: b09f09b02d am: 0e5fdb184d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: I282af7cad68106b706d6b6fa477d720797b74ad1
2020-10-16 07:48:10 +00:00
Amit Mahajan
0e5fdb184d Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47 am: b09f09b02d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: If8cd3e5f3aec33840fc5a7477e2895dc6f2a158c
2020-10-16 07:35:48 +00:00
Amit Mahajan
b09f09b02d Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: Ib2b9864613071c7a6819f03d5c1803b81b9a6575
2020-10-16 06:39:15 +00:00
Amit Mahajan
7b9edcde47 Merge "Add the extra "Ask every time" if supported only" 2020-10-16 06:21:34 +00:00
Kevin Chyn
af7837f602 Update generateChallenge/revokeChallenge w/ frameworks/base
Bug: 171002801
Bug: 170517180
Test: Enroll on existing devices
Change-Id: I78530fde275c5ac924e50d77de43b90969d6eb5b
2020-10-15 18:41:47 -07:00
xshu
1246f4c42c Increase mac rand char limit for translation
Per request in b/170679746

Bug: 170679746
Test: compile
Change-Id: I909cbd3818ce126ab6341da26fd15961ec897ae9
2020-10-15 15:55:17 -07:00
TreeHugger Robot
a38a53210c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 647666a50f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0af8d2ef9816ae0530f46964b4be993eee646794
2020-10-15 15:06:43 +00:00
TreeHugger Robot
647666a50f Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-10-15 14:49:31 +00:00
Neil Fuller
8a339e82cd Merge "Adjust wording for auto time / time zone detection" am: 0b71d1ef94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12792959

Change-Id: I53f533d6d541f55da29dc3652cdbdc575bf77ad7
2020-10-15 12:40:21 +00:00
Neil Fuller
0b71d1ef94 Merge "Adjust wording for auto time / time zone detection" 2020-10-15 12:19:44 +00:00
TreeHugger Robot
7622548f28 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 93070ad7dc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I09b6f1fd39447d65039c16741d7863f2644e49dd
2020-10-15 07:36:50 +00:00
TreeHugger Robot
93070ad7dc Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-10-15 07:08:11 +00:00
TreeHugger Robot
63e54954c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7ea9985044 -s ours am: 572317ad54 -s ours am: de8ebd9b28 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I34c9a69be9f680cd145c545dd1dbe5c6ecaf09f9
2020-10-15 05:43:27 +00:00
TreeHugger Robot
de8ebd9b28 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7ea9985044 -s ours am: 572317ad54 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I450bcf8c5e96b3d6531921870795af4c5ee909da
2020-10-15 05:21:01 +00:00
TreeHugger Robot
572317ad54 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7ea9985044 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I974c00175f51aff80549aaf850f658bf95b69e00
2020-10-15 04:26:23 +00:00
Bill Yi
8378a840c1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3d0868dfdbcae216cf3c4d4b0c127e7c967ef634
2020-10-14 21:12:09 -07:00
TreeHugger Robot
7ea9985044 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-10-15 04:00:32 +00:00
Bill Yi
2867070754 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9d42c43812a2a842517fd383c50be6c4da941093
2020-10-14 20:25:26 -07:00
Bill Yi
5a1be6612c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic14ca287b29a6287c1541c308e33ddcede2717f7
2020-10-14 19:39:32 -07:00
TreeHugger Robot
a55eed414f Merge "Launch customized panic setting intent when configured." am: 0e7d09fc8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12818073

Change-Id: Id5e2d6da26b3a9e52574c6a0e339a6251170d80c
2020-10-15 00:42:35 +00:00
TreeHugger Robot
0e7d09fc8c Merge "Launch customized panic setting intent when configured." 2020-10-15 00:09:53 +00:00
TreeHugger Robot
d21394f379 Merge "Remove "Edit emergency contact" tile from panic settings." am: 0b5dd5e88a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12839157

Change-Id: I14a1332fc6a34e96b08e7b7cef452ae4d1ab22e1
2020-10-14 21:13:00 +00:00
TreeHugger Robot
0b5dd5e88a Merge "Remove "Edit emergency contact" tile from panic settings." 2020-10-14 20:30:31 +00:00
Fan Zhang
c63a13c858 Launch customized panic setting intent when configured.
When RRO provides a custom intent package for panic settings and there
is an app to handle it, launch the custom intent instead of the AOSP
version.

Bug: 169946508
Test: robotests
Change-Id: I8479c6e0dd4a90b5a03640035b710ae4ccc7809c
2020-10-14 12:20:33 -07:00
Fan Zhang
f7b6a236a4 Remove "Edit emergency contact" tile from panic settings.
Fix: 170636818
Test: manual
Change-Id: I428dbe784be3ac6af045b045a709815eafaae4a9
2020-10-14 10:16:54 -07:00
Sally Yuen
9d1107df02 Merge "Add Bold Text to Accessibility settings screen" am: 80c5b8ffe3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12783543

Change-Id: If4d44a7d728cb51d0b8758a891746b2969da4254
2020-10-14 16:27:46 +00:00
Sally Yuen
80c5b8ffe3 Merge "Add Bold Text to Accessibility settings screen" 2020-10-14 16:08:13 +00:00
Jeff DeCew
ab54f78a0b [automerger skipped] Merge "Update NotificationChannelSettings Preferences in place to prevent re-layout." into rvc-qpr-dev am: e9523b7636 am: 03ebcc2474 -s ours am: 2927d0b9d8 -s ours
am skip reason: Change-Id If6acf305c44085e502a3304ea57e409ce049b40f with SHA-1 b409b64045 is in history

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

Change-Id: Ide7faff89ec9de7789dd5dd97482d13789c1274c
2020-10-14 15:13:35 +00:00
Jeff DeCew
2927d0b9d8 [automerger skipped] Merge "Update NotificationChannelSettings Preferences in place to prevent re-layout." into rvc-qpr-dev am: e9523b7636 am: 03ebcc2474 -s ours
am skip reason: Change-Id If6acf305c44085e502a3304ea57e409ce049b40f with SHA-1 b409b64045 is in history

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

Change-Id: I7d0d273a0b63adc217c62602ab90431d2eeba640
2020-10-14 14:57:24 +00:00
Jeff DeCew
03ebcc2474 Merge "Update NotificationChannelSettings Preferences in place to prevent re-layout." into rvc-qpr-dev am: e9523b7636
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12792910

Change-Id: I55f6310b344baebfe6a4425d3644d22d8e479638
2020-10-14 14:41:46 +00:00
Jeff DeCew
e9523b7636 Merge "Update NotificationChannelSettings Preferences in place to prevent re-layout." into rvc-qpr-dev 2020-10-14 14:26:56 +00:00
TreeHugger Robot
dba0acdd9b Merge "Fix output switcher will show 2 media session when remote playing" am: 7862d99079
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771900

Change-Id: I2867fdea19d391639ad85bd1376e1bbe3ae5c216
2020-10-14 13:18:23 +00:00
TreeHugger Robot
7862d99079 Merge "Fix output switcher will show 2 media session when remote playing" 2020-10-14 13:02:38 +00:00
TreeHugger Robot
6222267d8a Merge "Add the explicitly mutable flag for creating a PendingIntent" am: 3ed34cd538
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12831276

Change-Id: Iae3a4874034466ccd9bc4a8d064d4126d78d8ac1
2020-10-14 10:55:29 +00:00
Treehugger Robot
6323230ef9 Merge "Remove dup READ_PRIVILEGED_PHONE_STATE permission" am: 3eb10277da am: 6d5943e6b8 am: bfc09343cd am: 2f3b18d91d am: 26614064ff
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455948

Change-Id: I0ff62a87e29b981209b9767fb47ae06b9835cb44
2020-10-14 10:55:10 +00:00
TreeHugger Robot
3ed34cd538 Merge "Add the explicitly mutable flag for creating a PendingIntent" 2020-10-14 10:48:24 +00:00
Treehugger Robot
26614064ff Merge "Remove dup READ_PRIVILEGED_PHONE_STATE permission" am: 3eb10277da am: 6d5943e6b8 am: bfc09343cd am: 2f3b18d91d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455948

Change-Id: I1d6dbebdbdcb573b400c781b990f54e0fd24f27c
2020-10-14 10:41:50 +00:00
Treehugger Robot
2f3b18d91d Merge "Remove dup READ_PRIVILEGED_PHONE_STATE permission" am: 3eb10277da am: 6d5943e6b8 am: bfc09343cd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455948

Change-Id: If24b7f4cd32244d6db62d6757760375a35357143
2020-10-14 10:27:47 +00:00
Hugh Chen
e16a8077b5 Fix output switcher will show 2 media session when remote playing
Before this CL, output switcher will show 2 media sessions when
some apps are remote playing. The root cause is some apps will
also create local media sessions when they cast media to remote
playing.

This CL add condition to only show remote sessions on output switcher
if apps both have remote and local sessions.

Bug: 169052790
Test: make -j42 RunSettingsRoboTests
Change-Id: I80479d35b2bb2e353cf41f41f457f2dfd15cadbf
2020-10-14 17:58:47 +08:00
Treehugger Robot
bfc09343cd Merge "Remove dup READ_PRIVILEGED_PHONE_STATE permission" am: 3eb10277da am: 6d5943e6b8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455948

Change-Id: I6778ca0c8bed83621ae5ea38c184ad338b81279e
2020-10-14 09:43:44 +00:00
Sunny Shao
0b0f237834 Add the explicitly mutable flag for creating a PendingIntent
- Android S+ to specify explicitly either FLAG_MUTABLE or FLAG_IMMUTABLE
  when creating a PendingIntent.
- Suggest to use the FLAG_IMMUTABLE as default. Change it to
  FLAG_MUTABLE while errors occur.

Fixes: 170162598
Fixes: 170162878
Fixes: 170163592
Fixes: 170164316
Fixes: 170164458
Fixes: 170164327
Fixes: 169794524
Fixes: 170165106
Test: build pass, manual test add an account and volume control panel
Change-Id: I5aec028f82bd74fc4530b95a7c144811055ae2c5
2020-10-14 09:38:51 +00:00
Treehugger Robot
6d5943e6b8 Merge "Remove dup READ_PRIVILEGED_PHONE_STATE permission" am: 3eb10277da
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455948

Change-Id: I0ed900b4fcfb24200d68d7bbb802a5192d1f967b
2020-10-14 09:24:07 +00:00
Treehugger Robot
3eb10277da Merge "Remove dup READ_PRIVILEGED_PHONE_STATE permission" 2020-10-14 09:10:25 +00:00
Yi Jiang
ef232594fd Merge "Merge Screen Attention and Screen timeout Settings." am: 79dc82fb6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12560323

Change-Id: I83e6697a26bc46734d13ec5976939d3d102dcd3b
2020-10-14 05:34:34 +00:00
Yi Jiang
79dc82fb6f Merge "Merge Screen Attention and Screen timeout Settings." 2020-10-14 05:07:40 +00:00