PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,774 Commits 1 Branch 0 Tags
4b7494f5c9a9456d336824cb15e33154253e05c8
Commit Graph

94774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Menghan Li
4b7494f5c9 Merge "Fix color checking error of the repohooks" into sc-v2-dev am: f6c50fefd0 am: 805e33ae6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15749103

Change-Id: I8fd1d28fb1181aba66bbecf733714cb3bb67becb
 2021-09-06 11:22:23 +00:00
Menghan Li
805e33ae6b Merge "Fix color checking error of the repohooks" into sc-v2-dev am: f6c50fefd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15749103

Change-Id: I22c44dfd19861f8e60973d89b822cef16d2196d2
 2021-09-06 11:07:53 +00:00
Menghan Li
f6c50fefd0 Merge "Fix color checking error of the repohooks" into sc-v2-dev 2021-09-06 10:55:08 +00:00
TreeHugger Robot
a366a24b4e Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-v2-dev am: 2ff09ceeb7 am: 903293aa41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15743485

Change-Id: I8558d9e58a9ff86d5ce4df95e551b350fc5a02d6
 2021-09-06 09:49:27 +00:00
TreeHugger Robot
903293aa41 Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-v2-dev am: 2ff09ceeb7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15743485

Change-Id: I3c4676dfeb01743cd4aff1af440f1f819829a138
 2021-09-06 08:34:46 +00:00
TreeHugger Robot
2ff09ceeb7 Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-v2-dev 2021-09-06 08:10:21 +00:00
Betty Chang
56d0ee9099 [automerger skipped] Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5 am: edd650f6b5 -s ours am: becaef984f -s ours 
am skip reason: Merged-In I7b7a3e1b6d72709acbae0a0433af897a28d73afc with SHA-1 8dec2efc67 is already in history

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

Change-Id: Idb166e75d42cea5c1e7b73e7b8fb88d274323c2c
 2021-09-06 04:20:50 +00:00
Betty Chang
80ed904830 [automerger skipped] Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5 am: ebdc0e26f6 am: 3b1c25573b -s ours 
am skip reason: Merged-In I7b7a3e1b6d72709acbae0a0433af897a28d73afc with SHA-1 bea12d4bbe is already in history

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

Change-Id: Ic9625c255a91c19d9f546d771e07af606c65a838
 2021-09-06 04:20:44 +00:00
TreeHugger Robot
1a2d1017ec Merge "Revert "Revert "Support two pane design in the Settings app.""" into sc-v2-dev am: 50020de6f5 am: 6e55a559d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15756805

Change-Id: I37f62eb7d9c90adf05508587511bff547813e69c
 2021-09-06 04:20:35 +00:00
Betty Chang
becaef984f [automerger skipped] Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5 am: edd650f6b5 -s ours 
am skip reason: Merged-In I7b7a3e1b6d72709acbae0a0433af897a28d73afc with SHA-1 8dec2efc67 is already in history

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

Change-Id: I2f81d6f852d20d3f1c240f654c2074ac9d0f4c1b
 2021-09-06 04:20:03 +00:00
Betty Chang
3b1c25573b Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5 am: ebdc0e26f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403

Change-Id: Ia6abb73f2bfde7ad4c13ca0bcea28cfe6460968c
 2021-09-06 04:16:51 +00:00
Betty Chang
ebdc0e26f6 Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403

Change-Id: I5a889a42d677e064b7ef553405fc0a19996961ad
 2021-09-06 04:12:50 +00:00
Betty Chang
edd650f6b5 Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403

Change-Id: Ib0426da2b92a1c5771dffd2ff68618f14f331f44
 2021-09-06 04:12:49 +00:00
TreeHugger Robot
6e55a559d4 Merge "Revert "Revert "Support two pane design in the Settings app.""" into sc-v2-dev am: 50020de6f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15756805

Change-Id: I985ccc7165c69eb47ed9668fc889a75186d4d8ec
 2021-09-06 04:12:23 +00:00
Betty Chang
adc41a55d5 Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev 2021-09-06 04:00:59 +00:00
TreeHugger Robot
50020de6f5 Merge "Revert "Revert "Support two pane design in the Settings app.""" into sc-v2-dev 2021-09-06 03:57:01 +00:00
Sunny Shao
1564ef5ca1 Add more info on the dialog of AllowBindAppWidgetActivity 
- Show the label of the bound widget on the dialog of the AllowBindAppWidgetActivity.

Bug: 184676316
Test: manual test
Change-Id: Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531
 2021-09-06 11:52:51 +08:00
Tsung-Mao Fang
4781fc1687 Revert "Revert "Support two pane design in the Settings app."" 
This reverts commit 07037dbc3f.

Reason for revert: <Issue already was fixed in ag/15743576 and ag/15743577>

Bug: 197716926
Change-Id: I72b98f8feb513f34e88e735efd578a8e3d9a1963
 2021-09-06 02:41:26 +00:00
Curtis Belmonte
4ce94b1c65 [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: a9c1fa626b am: 9e3d13850e am: f854c14a0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: I0a86664d7b0e579dab65c88b6db507423cdd8aba
 2021-09-05 04:16:33 +00:00
Curtis Belmonte
18e06591d6 [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: a9c1fa626b am: 0cf4e6393f am: a2fe4f34a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: I784d42df3fdb4c0a42d93930a072d2d3a321fd1a
 2021-09-05 04:16:25 +00:00
Curtis Belmonte
61f0fd3a6c [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: 4f2f0ed6d5 am: 91cfb2c06c am: a8b2f6ac9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: I3dfbc9daeca6563872c90a0e46d48df42063a7a1
 2021-09-05 04:16:17 +00:00
Curtis Belmonte
f854c14a0c [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: a9c1fa626b am: 9e3d13850e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: I723c5d0fe373318ce109a2c73039f1627f70eb6c
 2021-09-05 04:01:39 +00:00
Curtis Belmonte
a2fe4f34a9 [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: a9c1fa626b am: 0cf4e6393f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: I313dfaa414411c011aa078166a5fbd0a4f821b4f
 2021-09-05 04:01:09 +00:00
Curtis Belmonte
a8b2f6ac9d [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: 4f2f0ed6d5 am: 91cfb2c06c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: Id45643428f8f47f46171d035560dbede92720c8d
 2021-09-05 04:01:03 +00:00
Curtis Belmonte
9e3d13850e [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: a9c1fa626b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: I5e7cd47b755b7a397e026acfb474d528911d8b39
 2021-09-05 03:49:02 +00:00
Curtis Belmonte
0cf4e6393f [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: a9c1fa626b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: Ic1acdad9cbe161b9f2aa5fa72bc569505bb66317
 2021-09-05 03:48:59 +00:00
Curtis Belmonte
91cfb2c06c [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: 4f2f0ed6d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: I5e527298abe4024bc5a8b1b42682e80a36c1e2a3
 2021-09-05 03:48:42 +00:00
Curtis Belmonte
a49ce807d6 [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: bb68c982de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: Iab6ea5af9b47e511713d21b195f468caa9789320
 2021-09-05 03:48:18 +00:00
Curtis Belmonte
4f2f0ed6d5 [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Bug: 198847997
Change-Id: Id730b3ccfada949186db2ab61046ee57ca0b82dc
 2021-09-05 00:11:08 +00:00
Curtis Belmonte
a9c1fa626b [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Bug: 198847997
Change-Id: Ib88caa522f11d1be6bc3ef9479cfdefe4eabf10a
 2021-09-05 00:11:06 +00:00
Curtis Belmonte
bb68c982de [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Bug: 198847997
Change-Id: I89a941373c69d41b40b111aa7fcd99aba2d14df6
 2021-09-05 00:11:05 +00:00
Curtis Belmonte
4592bf62a3 Update char limits for new UDFPS enroll strings 
Adds a character limit of 80 for titles and 160 for subtitles to be
shown as part of multi-stage UDFPS enrollment.

Test: Presubmit
Bug: 198847997
Change-Id: Ib85d1dc4f9bb127d641c84411f4dff2736484a5a
 2021-09-04 17:08:01 -07:00
Presubmit Automerger Backend
ba015531c3 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 am: c1b136b503 am: 4686860c50 am: 6ec46242cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Change-Id: Ic9dc77409e944ac4e4925c09c6e64c93e1bdc48a
 2021-09-04 23:49:28 +00:00
Presubmit Automerger Backend
97efc128f9 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 am: c1b136b503 am: 8bca5db8d3 am: 48bc6b659f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Change-Id: I01be0aa49cd334dba76ad5052e5992c8a09c9c7f
 2021-09-04 23:49:22 +00:00
Presubmit Automerger Backend
865f407cc2 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 am: 8d82ccdc24 am: 39928c53fc am: 74f6d47afa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Change-Id: Ia66d507dd8682bb8c8b530ccb52af336ec17f5b3
 2021-09-04 23:49:16 +00:00
Presubmit Automerger Backend
6ec46242cf [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 am: c1b136b503 am: 4686860c50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Change-Id: Ib57393361ced52d2d3233ccc06b85525a6788b9a
 2021-09-04 23:38:21 +00:00
Presubmit Automerger Backend
48bc6b659f [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 am: c1b136b503 am: 8bca5db8d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Change-Id: I913afb859272fa8924812aeb88e03db7128e4580
 2021-09-04 23:37:17 +00:00
Presubmit Automerger Backend
74f6d47afa [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 am: 8d82ccdc24 am: 39928c53fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Change-Id: I898d80c0cd231482f8427da7e273a9b3237ec58c
 2021-09-04 23:37:13 +00:00
Presubmit Automerger Backend
4686860c50 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 am: c1b136b503 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Change-Id: I0a4c5f88cbc9770457ee04275a64546c03699c45
 2021-09-04 23:24:48 +00:00
Presubmit Automerger Backend
8bca5db8d3 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 am: c1b136b503 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Change-Id: I1cbf1709e0a934874d41ff4def45d806e1f36ae8
 2021-09-04 23:24:47 +00:00
Presubmit Automerger Backend
39928c53fc [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 am: 8d82ccdc24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Change-Id: I6ea222460fa8c4653943e0c4bc73ea07bb1c2b52
 2021-09-04 23:24:30 +00:00
Presubmit Automerger Backend
371ea979b6 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 am: 57fb953a03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Change-Id: Ib696dff1d2e530fd92c6b7db8cbe10979345aacf
 2021-09-04 23:24:03 +00:00
Presubmit Automerger Backend
8d82ccdc24 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Bug: 198847997
Change-Id: I5ba1c5d10c85b1dec25f4f2438439924585d9c3b
 2021-09-04 20:49:34 +00:00
Presubmit Automerger Backend
c1b136b503 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Bug: 198847997
Change-Id: Iaec5471868501824dbb0aa4cfe76feeff698133c
 2021-09-04 20:49:34 +00:00
Presubmit Automerger Backend
57fb953a03 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Bug: 198847997
Change-Id: I1d552d3d428f400d7182b2e4a3389d4c3b8d9ba6
 2021-09-04 20:49:33 +00:00
Curtis Belmonte
c84e18b253 Add new strings for UDFPS 4-stage enrollment 
Adds strings that will be shown during the new tip and edge enrollment
stages of the UDFPS enrollment flow.

Test: Presubmit

Bug: 198847997
Change-Id: I11a9889ec0e5079c3531367bfa397a1910f42af6
 2021-09-04 13:48:28 -07:00
Bill Yi
4eb2f8f23c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -s ours am: 790491bc0f -s ours am: 5978ae7c3b -s ours am: c003bc13f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic517c23ec79e12d7c756dfc35a56ed72b696dbab
 2021-09-03 21:14:06 +00:00
Bill Yi
e00df0a31d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d -s ours am: e49c8b9929 -s ours am: f4368a3a41 -s ours am: 1c2c9f6c42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ba0dbe8e6844ec83683d2878e0779257f6f8e37
 2021-09-03 21:14:01 +00:00
Automerger Merge Worker
828ee225c2 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -s ours am: e183f5a054 -s ours" into sc-qpr1-dev-plus-aosp am: eea7ed8ba2 -s ours am: 55e2fdbe94 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc24cfd3b56403330682cf12c01127a8affe4b17
 2021-09-03 21:13:56 +00:00
TreeHugger Robot
c69ec48973 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours am: 20a3a9ac3d -s ours am: 0c0b1bf900 -s ours am: 7c189c31fe -s ours am: 86a970f2f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83f76ff6bdeef6c3346db149785c05e996ecfba1
 2021-09-03 21:13:50 +00:00