Commit Graph

20078 Commits

Author SHA1 Message Date
TreeHugger Robot
11304fb8a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-02 17:50:47 +00:00
TreeHugger Robot
74ab66f631 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-02 16:31:43 +00:00
Bill Yi
b9ff4275f3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I01190d1453f17ee5a42b303cfd201a4a8ed5a458
2020-09-02 13:28:38 +00:00
Bill Yi
25e90ee101 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6efada3aedd313f97b1405db8164499180316b89
2020-09-02 12:53:56 +00:00
Bill Yi
0009d56501 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I412e0c9881bc5de07ce964b2dc8892bb3e23db60
2020-09-02 12:17:48 +00:00
Xin Li
d57e13f558 Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master 2020-09-01 20:04:34 +00:00
SongFerng Wang
19222f2154 Merge "Add NR network type to "Global" mode preference" 2020-09-01 04:09:35 +00:00
Xin Li
748efff856 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Ie9d2c4d6d4618a167af1c5627d5d7918a404f398
Change-Id: I2ae428e37fd96226ce4e06032e2c0beaacbd0301
2020-08-28 23:35:54 -07:00
Avinash Nalluri
e4956322e8 Add NR network type to "Global" mode preference
Change-Id: I3b9ce75eb37a5002f7a77561c987c6758baf139b
Bug: 163382085
2020-08-27 15:56:13 -07:00
Fan Zhang
6c046831de Override 2 getSliceUri() instance to return platform slice
(This is not a clear cherry-pick, @Override need to be removed.)

Bug: 126222433
Test: robotest
Merged-In: I3f9c8202d9b75b24b80ebcf385abc95f8df851e2
Change-Id: Iec9fae48e91baef5861baef946fc155b1eb37904
2020-08-11 04:24:27 +00:00
Raff Tsai
91d40cdb21 Remove PreferenceCategory wrapper
- Avoid similiar issue in b/130396913

Bug: 124129485
Test: manual
Merged-In: I6f4698304210bacba5c76020c375dda49330d2cc
Change-Id: I9d5d856f586ab660a5adb17c0bb1f49e90eca198
2020-08-10 17:03:13 +08:00
Tsung-Mao Fang
d042a9f2d3 The text on toast should be changed when remains 1 time for SIM lock input
The behavior of getQuantityString() is different according to language, it gets both "other" and "one" string if English is system language. But it always gets "other" string if non-English, then the "other" string of wrong_pin_code is shown even if remains 1 time of SIM lock input.

In order to change the string in any language, we add new string for remains 1 time.

Test: Rebuild rom
Fix: 71783850
Merged-In: If4b53bbbc6b51582bc0837abf4497d9a75ebbaad
Change-Id: I1c069333b19399b727e10ed4a6c9483cc1bc44a6
2020-08-07 06:19:07 +00:00
Raff Tsai
cbd234e1c1 Remove useless png and add vector drawable
Bug: 139336138
Test: visual
Merged-In: I5ccf4855b63f47b138a1662317d0c4ba8ce8984c
Change-Id: If7de9126c8afab3422999db66ad9b7a179334f10
2020-08-06 09:03:32 +08:00
Bonian Chen
35be6641af Merge "[Settings] Allow talkback to focus and select APN" 2020-08-03 05:25:43 +00:00
Bonian Chen
ec42c98e8b Merge "[Settings] Learn more link should be removed when not supported." 2020-08-03 05:25:20 +00:00
Bonian Chen
5331b6589b [Settings] Allow talkback to focus and select APN
Change the focus area to help talkback focus on APN items.

Bug: 149794675
Test: manual
Merged-In: I5f391be89a5b22095d6f0d04b187ea18970f18d4
Change-Id: I6d2d1624c5946a30b59343de06de6f79adf24011
2020-08-02 21:36:49 +08:00
Bonian Chen
1c5431bf23 [Settings] WEA title wording change
The wording of WEA need to align in UI entry and UIs within.
The "Wireless Emergency Alerts" should be the official wording for it.

Bug: 158498436
Test: build pass
Merged-In: I17e6659915e1038c8ab11ad4003c08f87bbdb82e
Change-Id: I4c1c4009287092703669f89981fd017ce605d4fe
2020-08-02 21:30:32 +08:00
Bonian Chen
fed54f7dc4 [Settings] Learn more link should be removed when not supported.
Learn more wording with link only help people when configured.
When no link available, these wording had better removed to avoid from
confusing people.

Bug: 159510116
Test: manual
Merged-In: I36b74b2b4586546090fb88562e8f4f052a877709
Change-Id: If7061e0be201b2f98964a7b0eec42cc17cb11ae3
2020-08-02 21:14:25 +08:00
joffenberg
43ee102921 Remove "storage type" preference from Settings
Since storage type is mandated as hardware-backed, this preference is no longer meaningful.

Bug: 160225361
Test: atest SettingsRoboTests
Change-Id: I9b6c1d6afdd3563201b1e85673acf4d8cb81c0a1
2020-07-21 17:18:47 +02:00
Eran Messeri
f37c8cb4f7 [DO NOT MERGE] Rollup Cert-related changes from R
This change includes the following commits from internal R branch
which are related to certificate management:

0206e76f46 CredentialStorage: Install keys using KeyChain
09ceea53d9 Added functionality to select type of certificate to be installed from the Settings app
3acf3f5433 WiFi certificates installable from Wifi sub-preference
8439fd15f7 Fix strings for certificate installation in Settings

Bug: 161347472
Test: builds & manual testing
Change-Id: Ia59dc4780254fab4f34c2f61b25f3b4e56ed7b77
2020-07-15 15:12:06 +01:00
Lucas Dupin
1530c46690 Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

Change-Id: Ie05cfa7cc0897e370c3ced865dceee0745b5533c
2020-06-29 18:48:39 +00:00
Lucas Dupin
837bda1f25 Merge "Change the order of dark theme options to match night light" into rvc-dev 2020-06-29 18:35:12 +00:00
TreeHugger Robot
f002dd72ac Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-29 07:24:13 +00:00
Bill Yi
45092142eb Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ibfe2b145e92201622fda1d57bae726dd5d4e4eab
2020-06-28 22:35:46 -07:00
Bonian Chen
6e8f6d840a Merge "[Settings] Learn more link should be removed when not supported." into rvc-dev am: 136cb73ae6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970202

Change-Id: I7af555ea420dc289052553706931fbfea55edf45
2020-06-29 01:53:51 +00:00
Bonian Chen
136cb73ae6 Merge "[Settings] Learn more link should be removed when not supported." into rvc-dev 2020-06-29 01:42:26 +00:00
Bill Yi
9055425240 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Icf83136caadca9065b4e3cc03ad45ba6e8fa85f2
2020-06-26 13:47:52 -07:00
TreeHugger Robot
8d0f467d19 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-26 15:47:22 +00:00
TreeHugger Robot
114e03a03c Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-26 15:39:59 +00:00
Bill Yi
0476ba2351 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I382250623c8d94902321eed292029fbb8a7b8868
2020-06-26 07:30:16 -07:00
Bill Yi
93ac3f385c Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I1922549e1ea3ef21f29e13d3cfadc5744f4568c2
2020-06-26 06:45:51 -07:00
TreeHugger Robot
00d15c44bf Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-26 05:48:00 +00:00
Jay Aliomer
d96f81ac8c Change the order of dark theme options to match night light
Fixes: 159030764
Test: manually go to display -> dark theme
Change-Id: I71ab1d0699a9c7a4a873453321a3dca640a892b9
2020-06-25 23:30:38 -04:00
Bill Yi
fe9fb7b786 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I89c6ac21f9325fc08f84280ea09cac02641c9e33
2020-06-26 02:08:29 +00:00
Bill Yi
0b6df85dc2 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Idbafda711199ef3fde5bd6beee3422eb8a2694bb
2020-06-26 01:30:25 +00:00
TreeHugger Robot
1172dcd5be Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888

Change-Id: Ifab97862a30669ca741d7527092905ea8c777b37
2020-06-24 18:10:40 +00:00
TreeHugger Robot
1b57d227bd Merge "Increase char limit for translations" into rvc-dev 2020-06-24 17:59:39 +00:00
Beth Thibodeau
5e402df833 Increase char limit for translations
Fixes: 159629315
Test: compiles; comment change only
Change-Id: I59a72a2de26cdb33002138ba0e9eaf4e58ecd3c1
2020-06-24 12:03:06 -04:00
TreeHugger Robot
04652c4210 Merge "Update ouput switcher panel height from 6.5 to 5.5 slice items" into rvc-dev am: 3e0102a3cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983922

Change-Id: Ied14c1c4474ab9a15cbfe4c84486af71e5d8439c
2020-06-24 10:45:51 +00:00
TreeHugger Robot
3e0102a3cd Merge "Update ouput switcher panel height from 6.5 to 5.5 slice items" into rvc-dev 2020-06-24 10:29:40 +00:00
Tim Peng
382f81a570 Update ouput switcher panel height from 6.5 to 5.5 slice items
-design changes

Bug: 159776397
Test: manual test
Change-Id: I57a343ad6aeeb420d5d9f8eb1cd921a2c8bfa27d
2020-06-24 17:14:25 +08:00
tim peng
4d85ce5dce Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: Ie49eabe533e8305456cc04b241596aa7c6de81b7
2020-06-24 08:05:30 +00:00
tim peng
b6ed02fa26 Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev 2020-06-24 07:45:36 +00:00
Tim Peng
df46788a5d Apply round corner to the album icon in output switcher panel
Bug: 159766582
Test: manual test
Change-Id: I1535a13c137e9550920cf890c259a4075a2dfc05
2020-06-24 13:17:06 +08:00
Mathew Inwood
93c232993e Increase character limit. am: a5c9c0458c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198

Change-Id: Ifc81b836b436ebd7b4b6bcf498085ecd9a3c603e
2020-06-24 04:40:52 +00:00
Bonian Chen
5faf771722 [Settings] Learn more link should be removed when not supported.
Learn more wording with link only help people when configured.
When no link available, these wording had better removed to avoid from
confusing people.

Bug: 159510116
Test: manual
Change-Id: I36b74b2b4586546090fb88562e8f4f052a877709
2020-06-23 21:19:15 +08:00
Mathew Inwood
a5c9c0458c Increase character limit.
20 is not enough for several languages.

Test: TH
Bug: 159628588
Change-Id: I9f7b47951ea5a4e0eb2022347ebd5ea0db7f0c9e
2020-06-23 14:09:52 +01:00
tim peng
0217b38b00 Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev am: 6e10387a38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931339

Change-Id: Ie69913e09a49438c85e6266f0a7d948b9b459460
2020-06-23 02:37:25 +00:00
tim peng
6e10387a38 Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev 2020-06-23 02:22:46 +00:00
TreeHugger Robot
27d10f6b63 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-20 23:42:20 +00:00