PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
77,503 Commits 1 Branch 0 Tags
de444989b046ca3afec14de65b4bef1055f249cc
Commit Graph

77503 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
de444989b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1cc8bc0cbc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If993dec1036fae73ca66e7f57efccec5b06bdbef
 2020-10-17 20:30:36 +00:00
Bill Yi
c701c7ec61 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c58e9b1b -s ours am: 6b937e8542 -s ours am: d6efa21da7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1d63dcc47e4bd2bf208dac3f0e6b398bb1d6c2c
 2020-10-17 20:30:30 +00:00
TreeHugger Robot
1cc8bc0cbc Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-10-17 20:02:06 +00:00
Bill Yi
d6efa21da7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c58e9b1b -s ours am: 6b937e8542 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9702e915f1c597c817315080558d0af5bf6bca6
 2020-10-17 19:59:42 +00:00
Bill Yi
6b937e8542 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c58e9b1b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f3a41cdb6eb7df80718d40acf93e18fdfc5cc02
 2020-10-17 19:47:21 +00:00
Bill Yi
75f213e982 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id409765908bccc30904d26ded670edfc84a535ed
 2020-10-17 12:46:22 +00:00
Bill Yi
e0c58e9b1b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ide6e88b9dfe1253577e04f8a0d664530db31842d
 2020-10-17 11:35:11 +00:00
Ilya Matyukhin
ad29b26539 Merge "Update generateChallenge/revokeChallenge w/ frameworks/base" am: 252a9595a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12851194

Change-Id: I42a3276fb098a0bb5bdbaf5dd1753dd5064e3bb3
 2020-10-17 00:13:17 +00:00
Ilya Matyukhin
252a9595a8 Merge "Update generateChallenge/revokeChallenge w/ frameworks/base" 2020-10-17 00:10:47 +00:00
Kevin Chyn
6c31f27d5a Merge "Fix biometric string" am: 0a270aba11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12863847

Change-Id: I9af1cf35ddf58cdc7ab25b57dbdf9c2a5d21c316
 2020-10-16 23:16:41 +00:00
TreeHugger Robot
3d1f383707 Merge "Hide 'View plan' button in data usage settings" into rvc-qpr-dev am: 1a09d244d4 am: 09a906b972 am: 9c989442d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12755868

Change-Id: I766f85398f09a6ebd11f4cc8223cd61cbb60b7e0
 2020-10-16 23:16:20 +00:00
Kevin Chyn
0a270aba11 Merge "Fix biometric string" 2020-10-16 23:00:44 +00:00
TreeHugger Robot
9c989442d1 Merge "Hide 'View plan' button in data usage settings" into rvc-qpr-dev am: 1a09d244d4 am: 09a906b972 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12755868

Change-Id: I8101838915bb821e9ce6483ba2c7d21ad894a0e5
 2020-10-16 22:58:21 +00:00
Oscar Shu
9be7e466d4 Merge "Increase mac rand char limit for translation" am: f0d864ac5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12854080

Change-Id: I452273c8101b4f2b691ae421bb943b4bf04a7647
 2020-10-16 22:51:51 +00:00
TreeHugger Robot
09a906b972 Merge "Hide 'View plan' button in data usage settings" into rvc-qpr-dev am: 1a09d244d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12755868

Change-Id: I0026c3fbb1bf26d68f203c36c49576deb6d79681
 2020-10-16 22:42:07 +00:00
Oscar Shu
f0d864ac5a Merge "Increase mac rand char limit for translation" 2020-10-16 22:30:44 +00:00
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
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