Commit Graph

102096 Commits

Author SHA1 Message Date
Bill Yi
572d0be27b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9a68c077f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I26049202d9fc95dfb5aec181debd9bf690972a2d
2022-03-18 02:44:00 +00:00
Bill Yi
c353618b2e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1575c5762c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iddee08f13235485231e96c4331c080f44e3a1d89
2022-03-18 02:43:53 +00:00
Bill Yi
e3385a5bc8 Merge changes from topic "presubmit-am-186dac0b6d4f44a59e4bc743cd0fd9b4" into tm-dev am: 2d8cc15ec7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17206624

Change-Id: Ia84f0a481eec762aa0342dbb49ae0df604b58267
2022-03-18 02:43:29 +00:00
Bill Yi
ee1c029095 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 50710ebebc am: 33db44bfe7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I758a1030f9798dbaecbc17a00633ec264a7cabc9
2022-03-18 02:43:27 +00:00
Bill Yi
c248a78d60 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c0abe010c1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibeb1504a463f242b1e36a1f337cb77711dec4a23
2022-03-18 02:41:45 +00:00
Bill Yi
39de788383 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e46d423191 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I45301965843deafdf9ae3e7cbc3b51bd7504d117
2022-03-18 02:41:44 +00:00
Bill Yi
18cb77b66a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-03-18 02:25:45 +00:00
Bill Yi
c0c5c066f4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-03-18 02:25:29 +00:00
Bill Yi
e9439fc897 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-03-18 02:24:33 +00:00
Bill Yi
9b874759b1 Merge changes from topic "presubmit-am-38324c67819045d99732392e5fe804f8" into sc-v2-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d7f03d94b
  Import translations. DO NOT MERGE ANYWHERE
2022-03-18 02:24:27 +00:00
Bill Yi
0980b77d42 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-18 02:22:50 +00:00
Bill Yi
2d8cc15ec7 Merge changes from topic "presubmit-am-186dac0b6d4f44a59e4bc743cd0fd9b4" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 50710ebebc
  Import translations. DO NOT MERGE ANYWHERE
2022-03-18 02:22:40 +00:00
Bill Yi
c0abe010c1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-18 02:22:19 +00:00
Bonian Chen
86027479cb [Settings] Enable support for AdaptiveIcon (Data Usage, Hotspot, VPN)
This is a change to enable the support of AdaptiveIcon for following
widgets:
1. Data Usage
2. Wi-Fi Hotspot
3. VPN

Bug: 225252321
Test: local
Change-Id: I523dee9cfd435a95fd31e8730053e0d9ff2c2339
2022-03-18 09:23:19 +08:00
Peter_Liang
b8f477691c Polish and humanize the strings for the preview of mail content.
Bug: 219163254
Test: manual test
Change-Id: I54bdd13f6cafeec1d68e414ce07cdc09608f2165
2022-03-18 09:05:35 +08:00
Kate Montgomery
144c51ed76 Merge "Fix settings page flicker in two ways: 1. On create use UiBlocker as recommended by settings team 2. On resume only update the preferences list if the system setting has changed." into tm-dev am: 798a0fab9c am: d9e8d4e5cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17219772

Change-Id: If65c92039c15d3bbe8153baffe7f324a1394758d
2022-03-17 20:05:55 +00:00
Kate Montgomery
2d570febb1 Merge "Fix settings page flicker in two ways: 1. On create use UiBlocker as recommended by settings team 2. On resume only update the preferences list if the system setting has changed." into tm-dev am: 798a0fab9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17219772

Change-Id: Ib17152dbc29a9cc0588607966da310e53cdba4bb
2022-03-17 19:46:34 +00:00
Kate Montgomery
d9e8d4e5cd Merge "Fix settings page flicker in two ways: 1. On create use UiBlocker as recommended by settings team 2. On resume only update the preferences list if the system setting has changed." into tm-dev am: 798a0fab9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17219772

Change-Id: I5e19c1ec324bb099b0a5d966cb2fd934393c28e7
2022-03-17 19:45:15 +00:00
Kate Montgomery
798a0fab9c Merge "Fix settings page flicker in two ways: 1. On create use UiBlocker as recommended by settings team 2. On resume only update the preferences list if the system setting has changed." into tm-dev 2022-03-17 19:14:04 +00:00
kholoud mohamed
de78149c16 RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class
Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I4775d7741c7819fd811c3fc4eda1636b1e04b398
2022-03-17 17:37:45 +00:00
Yuri Lin
d5f6bde3f2 Merge "Remove preference category in zen mode alarms page" into tm-dev am: cbc67a41a0 am: a7fcd55623
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17224572

Change-Id: I8aa73de194835983d45408f8ecacde916284430f
2022-03-17 16:31:21 +00:00
Yuri Lin
a7fcd55623 Merge "Remove preference category in zen mode alarms page" into tm-dev am: cbc67a41a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17224572

Change-Id: Ia83c5204d6a42f472f480cb71c06a44e1e4c9cd4
2022-03-17 15:58:56 +00:00
Yuri Lin
d9414ee1b5 Merge "Remove preference category in zen mode alarms page" into tm-dev am: cbc67a41a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17224572

Change-Id: I6b0aa6c6fea35265104906401ce4a8e638be60be
2022-03-17 15:57:19 +00:00
Yuri Lin
cbc67a41a0 Merge "Remove preference category in zen mode alarms page" into tm-dev 2022-03-17 15:17:31 +00:00
Giulio Fiscella
9112567332 Use new severity levels and builders
Test: atest SettingsUnitTests
Bug: 218817241
Bug: 220367542
Change-Id: I9fa4b22e0ca1ca63e75eab427a7beedd95b744da
Merged-In: I9fa4b22e0ca1ca63e75eab427a7beedd95b744da
2022-03-17 11:44:39 +00:00
Giulio Fiscella
8861c5d16c [automerge] Use new severity levels and builders 2p: 3612e9e440
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17238283

Bug: 218817241
Bug: 220367542
Change-Id: I75a2c08dc05fcf6788d034c3981164cfe23a20d8
2022-03-17 11:34:56 +00:00
Giulio Fiscella
3612e9e440 Use new severity levels and builders
Test: atest SettingsUnitTests
Bug: 218817241
Bug: 220367542
Change-Id: I9fa4b22e0ca1ca63e75eab427a7beedd95b744da
2022-03-17 11:34:42 +00:00
Oli Lan
ede86dbb21 Merge "Reduce gap above user list in multiuser settings." into tm-dev am: 8b096f0400 am: 3c322441b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17221043

Change-Id: I7ae4846475bd18b505e8b38c81f55475b78a8d5d
2022-03-17 11:00:26 +00:00
Oli Lan
3c322441b0 Merge "Reduce gap above user list in multiuser settings." into tm-dev am: 8b096f0400
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17221043

Change-Id: I5b565e13df90d73cec0b4d70159502da8c75fff4
2022-03-17 10:26:55 +00:00
Oli Lan
0a930a6ae7 Merge "Reduce gap above user list in multiuser settings." into tm-dev am: 8b096f0400
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17221043

Change-Id: I6862bc73e008def7eeabca63681b7cfd2df72c41
2022-03-17 10:26:52 +00:00
Oli Lan
8b096f0400 Merge "Reduce gap above user list in multiuser settings." into tm-dev 2022-03-17 09:58:09 +00:00
Tsung-Mao Fang
c2e5d84257 Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9 am: 31c02007ef am: 7052d53fd8 am: 469e484b37 am: 5451480da8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572

Change-Id: I94fc1c73d7c80e66f09e798dc167ecc0ed71d09d
2022-03-17 09:55:48 +00:00
Jason Hsu
886e25a183 Merge "Add the string for new flow to hint user about triple-tap will delay when user select triple-tap shortcut on window-mode." into tm-dev am: f8f1ff2594 am: 0534243168
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17217203

Change-Id: I557316d7a074d7157d8726dc7b2500196d13de98
2022-03-17 09:55:29 +00:00
Peter_Liang
d57ae61aa9 Fix that icons overlapped in Preview at Display size and text screen under Vision Settings.
Change the app grid view from 4 columns to 3 columns, and app count from 8 to 6.

Fix: 222241141
Test: manual test
Change-Id: I66c131be77971c9ccc3ee796a6732ff65aac01a5
2022-03-17 17:31:02 +08:00
Tsung-Mao Fang
a3e7f3dbac Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9 am: 31c02007ef am: 7052d53fd8 am: 469e484b37
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572

Change-Id: I07a98c4f687a5d3623a82edddbcf854b517cdeb7
2022-03-17 09:23:10 +00:00
Tsung-Mao Fang
5451480da8 Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9 am: 31c02007ef am: 7052d53fd8 am: 469e484b37
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572

Change-Id: Ibb62d41b1bc6df4d0de6db1ad5f076c1f79d95cf
2022-03-17 09:21:18 +00:00
Jason Hsu
b00938910e Merge "Add the string for new flow to hint user about triple-tap will delay when user select triple-tap shortcut on window-mode." into tm-dev am: f8f1ff2594
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17217203

Change-Id: I4aa54b397fd73f38c24f33ad5feb5aeefbbb0f30
2022-03-17 09:20:55 +00:00
Jason Hsu
0534243168 Merge "Add the string for new flow to hint user about triple-tap will delay when user select triple-tap shortcut on window-mode." into tm-dev am: f8f1ff2594
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17217203

Change-Id: I70f3a3d01359dbdaca501ccb90778e0e6dcc7211
2022-03-17 09:20:53 +00:00
Tsung-Mao Fang
469e484b37 Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9 am: 31c02007ef am: 7052d53fd8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572

Change-Id: I64c0a288da45a3b2ef6fe3297e9b7c148a045d87
2022-03-17 09:20:50 +00:00
Jason Hsu
f8f1ff2594 Merge "Add the string for new flow to hint user about triple-tap will delay when user select triple-tap shortcut on window-mode." into tm-dev 2022-03-17 08:46:50 +00:00
Tsung-Mao Fang
7052d53fd8 Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9 am: 31c02007ef
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572

Change-Id: I48bad553fd360ab51329e70a9857683014690743
2022-03-17 08:46:38 +00:00
Tsung-Mao Fang
31c02007ef Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572

Change-Id: I1797a32fe9037755a699c3d402d69d4d557c27c3
2022-03-17 08:14:09 +00:00
Tsung-Mao Fang
19d06e79b9 Merge "Settings: only set phone number if it's not empty" 2022-03-17 07:35:42 +00:00
Daniel Huang
05a975c814 Merge "[Panlingual] Handle onLocaleSelected." 2022-03-17 07:15:49 +00:00
SongFerng Wang
874becf8e4 [automerger skipped] Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" am: cfb201c400 am: 704147041b am: 61aa6e999d -s ours am: 900e447543 -s ours am: b2017cb8a9 -s ours
am skip reason: Merged-In Ic728749112b0047cac291600b3279b9dedbf0b5a with SHA-1 8339724c21 is already in history

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

Change-Id: I4635f68a93713f96c2da7de27a473c4ba23dd98a
2022-03-17 07:07:29 +00:00
SongFerng Wang
55a2bd3870 [automerger skipped] Merge "Add the battery information into device details header" am: 907b3fc4be am: 8ca446a175 am: 100d741cc8 -s ours am: 7c69e2951d -s ours am: 9ed4917433 -s ours
am skip reason: Merged-In Ib9f4c388c369dc374c43dd399111e02b5555159b with SHA-1 57dd3bc444 is already in history

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

Change-Id: Iab2fd6630703905f177f9d66fa3581fb6c88c5ee
2022-03-17 07:06:02 +00:00
Hugh Chen
d004638343 Fix connected device detail page slice items are in smaller font size
- Increase font size of slice items

Bug: 223502042
Test: build pass
Change-Id: I48ac0ff9734c467cc9c1cd0fa0e2b40ea02ecfa3
2022-03-17 07:05:52 +00:00
Mattias Nilsson
aa4ac1e5b9 Do not allow editing of mcc, mnc for carrier id APNs
A user that is allowed to edit mcc, mnc or mvno data can break
the APN list. If a carrier or OEM has added an APN that is
matched with carrier id there is no need to edit those fields.

Apn Editor should not throw any error when a user backs out of
from a carrier id APN where mcc, mnc is empty.

Disable editing of these fields and check for carrier id APN
before adding error message.

Test: Add carrier APN, insert sim and back out from ApnEditor
Bug: 222103038
Change-Id: I4e86cdd3e8caaf3dbfefe9b9f82f11c2804577ff
2022-03-17 06:54:08 +00:00
SongFerng Wang
b2017cb8a9 [automerger skipped] Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" am: cfb201c400 am: 704147041b am: 61aa6e999d -s ours am: 900e447543 -s ours
am skip reason: Merged-In Ic728749112b0047cac291600b3279b9dedbf0b5a with SHA-1 8339724c21 is already in history

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

Change-Id: I9391e68ca6f1209862e533892231ed1b52aeb524
2022-03-17 06:33:01 +00:00
SongFerng Wang
58ba917b21 [automerger skipped] Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" am: cfb201c400 am: 704147041b am: 61aa6e999d -s ours am: 900e447543 -s ours
am skip reason: Merged-In Ic728749112b0047cac291600b3279b9dedbf0b5a with SHA-1 8339724c21 is already in history

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

Change-Id: Ie1833f926ca40f30218924d70d0e38a86da012d9
2022-03-17 06:32:28 +00:00