Commit Graph

24140 Commits

Author SHA1 Message Date
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
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
adc41a55d5 Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev 2021-09-06 04:00:59 +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
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
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
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
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
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
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
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
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
6178db1a47 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-03 20:35:13 +00:00
TreeHugger Robot
84c4d4e69e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-09-03 16:47:39 +00:00
TreeHugger Robot
d9cd4e3358 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-09-03 16:47:33 +00:00
TreeHugger Robot
a64f9f261b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-03 16:47:06 +00:00
changbetty
8dec2efc67 Change the SIM color for passing the GAR
Bug: 195710292
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I7b7a3e1b6d72709acbae0a0433af897a28d73afc
Merged-In: I7b7a3e1b6d72709acbae0a0433af897a28d73afc
2021-09-03 04:07:31 +00:00
Bill Yi
978866b335 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1762ddff56b9f08da6ccce5a6aabf15de7dfc115
2021-09-02 13:49:39 +00:00
Bill Yi
4a0398c888 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I76a03c3361848e96d981867535cb1c987ffc410f
2021-09-02 13:45:37 +00:00
Bill Yi
1336ffec20 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1f957d47f370a5379c50a87a032f614ffb58ae76
2021-09-02 13:41:52 +00:00
Bill Yi
bdf999d90a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie4ee5453ddb85e01767e31d1d99d92d43c4dfc9d
2021-09-02 13:34:27 +00:00
Bill Yi
71904cfc78 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9d02ac4cb07e74c28f89f88f0048068ac5ecfaba
2021-09-02 13:32:52 +00:00
Bill Yi
fb4f0b0820 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I00320830b2c3434b32e8db54606c9ec4291c6cf7
2021-09-02 13:31:17 +00:00
TreeHugger Robot
0d4e7a27e4 Merge "Move legacy hide applications in usage screen list to SettingsGoogle" into sc-v2-dev am: 11d6ba6f57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737567

Change-Id: Ic2fb658dc7e42e87660564e6b3cf28df06fb0b43
2021-09-02 09:17:05 +00:00
ykhung
0a03758738 Move legacy hide applications in usage screen list to SettingsGoogle
Bug: 195306545
Test: make SettingsRoboTests
Change-Id: Iccb3530c40bc32c20d74d65aa3f26eb2d6719106
2021-09-02 11:57:54 +08:00
Bill Yi
31208c4948 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-29 20:09:43 +00:00
TreeHugger Robot
21bba0a43b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-28 08:02:33 +00:00
TreeHugger Robot
3575b70b77 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-08-28 08:02:29 +00:00
TreeHugger Robot
2e009c1a9e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-28 08:02:19 +00:00
TreeHugger Robot
74b4a3c8fb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-08-28 08:01:49 +00:00
Bill Yi
213015767f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iad6d2f05b128a85f5b72a6948cbfdf11b80eb837
2021-08-27 22:38:13 +00:00
Bill Yi
4f31189088 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5227d933dcb559cb1be8bb5a0bbcce612b0da2a4
2021-08-27 22:34:10 +00:00
Bill Yi
483d6621f3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibe92bbdc1c48b03b289f618ec57204de1e5742ac
2021-08-27 22:30:19 +00:00
Bill Yi
5e948972d5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5c1e4dfed1e6cfce314da6968ea38b7cc7a9dd9d
2021-08-27 22:22:36 +00:00
Bill Yi
e3d99cf9c6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I148b65f26df0f4c99f650bad6beef65918ae4870
2021-08-27 22:20:59 +00:00
Bill Yi
dbd589e440 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I96dd7efe4261508234fbb971a0d7e406d548a503
2021-08-27 22:19:26 +00:00
Victor Liu
9e9075949d Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into sc-qpr1-dev am: 989edd731d am: 4b3f7bac9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15676887

Change-Id: I12e543c1f689cd64d2eb01422c363e092cd0eb48
2021-08-27 02:26:38 +00:00
Victor Liu
4b3f7bac9b Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into sc-qpr1-dev am: 989edd731d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15676887

Change-Id: Ie5eaa98792e804e4fded2673f3ab5e32717a8b08
2021-08-27 02:14:00 +00:00
Victor Liu
1d35b1cd1b Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into sc-qpr1-dev am: 989edd731d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15676887

Change-Id: Iee67208eb135484aca10ae7c17894713795d1544
2021-08-27 02:13:58 +00:00
Victor Liu
989edd731d Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into sc-qpr1-dev 2021-08-27 01:57:14 +00:00
Android Build Prod User
0b8ff007b7 Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev am: 33af17ff31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516309

Change-Id: Ie0d087c70691e9363126c096625e9ee4aab44a63
2021-08-26 21:59:26 +00:00
Android Build Prod User
33af17ff31 Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev 2021-08-26 21:42:36 +00:00
Joy Babafemi
63976c2051 Revert "Revert "UWB: Re-enable UWB toggle""
This reverts commit 2e593b3784.

Reason for revert: Root cause b/196317865 fixed

Bug: 197519749
Change-Id: Ib0fee46471c7f110b265faedc62a3f66610bf7c2
Merged-In: Ib0fee46471c7f110b265faedc62a3f66610bf7c2
2021-08-26 20:27:23 +00:00
Betty Chang
6bdc44eeff Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev am: 6a3b697141 am: 2889a7d49f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15671537

Change-Id: I7a0f00431aeb0eacf23be1381148fbec15886b85
2021-08-26 11:39:43 +00:00