Commit Graph

100917 Commits

Author SHA1 Message Date
Giulio Fiscella
d5d6846846 Merge "Use new severity levels and builders" into tm-dev 2022-03-18 22:00:01 +00:00
Kweku Adams
6525ff3d79 Make action constants configurable.
Make it possible to configure the base price and cost to produce of all
supported actions.

Bug: 158300259
Bug: 189850067
Bug: 191876714
Bug: 191877052
Test: Manual
Change-Id: I2dcd3382f7404655fb0d10538a426071c157ea18
2022-03-18 18:54:00 +00:00
Yibo Wang
e20ddfa5f4 Add null check for mChannel object in WifiP2Settings
When user switch between settings of hotspot(Enable hotspot),
Internet(Enable Wifi) and Wifi-Direct(establish, disconnect and
forgot P2P connection).

mChannel becomes null during WiFi P2P user scenarios resulting
in Settings(com.android.settings) crash on enable Wifi.

This commit fixes mChannel IllegalArgumentException: Channel
needs to be initialized.

Test: manual test
Bug: 218608961
Change-Id: I72c67bcd1086afe2aa8d2c5521107e2d38e5b0bb
2022-03-18 15:08:51 +01:00
Chaohui Wang
50d9224a4c Fix flicker for Device admin apps.
Security ->Advanced settings-> Device admin apps

updateState() is called in DashboardFragment.onResume(), which after the view is visible to the user.

Rendering the items in updateState() caused the flicker.

Bug: 225283414
Test: On Pixel device
Change-Id: I7175c966fbbfbf5d6331f5ac26c06b60d59a4e0d
2022-03-18 21:26:42 +08:00
Tsung-Mao Fang
17ef335938 Clean up footer preference on battery saver page.
We set selectable as false in the footer preference library now,
so developers don't need to customize it.

Test: Same behavior on battery saver page.
Bug: 216516546
Change-Id: I188054ef2b317e6df1f54dc89d5c57c644e20ad7
2022-03-18 11:07:46 +00:00
Patrick Huang
8f1e3fec84 Hide emergency setting from "Search settings"
Use the same config value created in ag/16497464 and ag/16497621
to determine if emergency setting should be searchable in Settings.

Bug: 220437126
Test: Manual test on affected phone and tablet
Change-Id: I964dd9f75f6a5c3b239aabfa4dfce84cb75c8565
2022-03-18 06:51:31 +00:00
Arc Wang
f8e0b152ad Merge "Fix NullPointerException at ManageApplications$ApplicationsAdapter.access" into tm-dev 2022-03-18 05:56:51 +00:00
menghanli
12f2a7df0a Migrate SuW new flag isMNStyle into Accessibility
Bug: 223265372
Test: Manual testing
Change-Id: I0b7f4fb02a35c5e0638ddac7b6b49c622c52fbc1
2022-03-18 12:12:55 +08:00
Jason Chiu
3b1a9086a7 Merge "Update the default split ratio" into tm-dev 2022-03-18 03:12:14 +00:00
Bill Yi
d953313d3f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c0c5c066f4 -s ours am: 75cce69c9a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2d6008490cfe535514ef6d03d914a90024a63b53
2022-03-18 02:51:39 +00:00
Bill Yi
da9e66fe71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e4e39cee -s ours am: c0e6019a32 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4ded1f78ef71c9f174a50952ba99296b3ce0c851
2022-03-18 02:51:37 +00:00
Bill Yi
65bd2f419f Merge changes from topic "presubmit-am-38324c67819045d99732392e5fe804f8" into sc-v2-dev-plus-aosp am: 9b874759b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207704

Change-Id: I9b5ba470dc8e40ddd7b7bbe5e0642565962edf5a
2022-03-18 02:51:29 +00:00
Bill Yi
6adefff78e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d7f03d94b am: ae75e97012 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia844d632034948b5cc99ee21caaab7d9fe4ebccc
2022-03-18 02:51:27 +00:00
Bill Yi
75cce69c9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c0c5c066f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02a68c6262293bdcf21ec90dc7a96ac187041479
2022-03-18 02:50:07 +00:00
Bill Yi
c0e6019a32 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e4e39cee -s ours
am skip reason: subject contains skip directive

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

Change-Id: I61450277f98ace1bd9e3a9bb06244d18c0f627a8
2022-03-18 02:49:54 +00:00
Bill Yi
78abbdb6e4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 18cb77b66a -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: Ia3756535e8433e4f0826f4b5f8b61abf778cc495
2022-03-18 02:44:06 +00:00
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
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
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
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
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
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
Oli Lan
8b096f0400 Merge "Reduce gap above user list in multiuser settings." into tm-dev 2022-03-17 09:58:09 +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
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
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
900e447543 [automerger skipped] Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" am: cfb201c400 am: 704147041b am: 61aa6e999d -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: I4159419fa10d6601f1bf067751e1be95391a3426
2022-03-17 05:59:38 +00:00
SongFerng Wang
7c69e2951d [automerger skipped] Merge "Add the battery information into device details header" am: 907b3fc4be am: 8ca446a175 am: 100d741cc8 -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: Ib4a5cf75d40e246f89c67b0c3f175257f71f5ce2
2022-03-17 05:58:39 +00:00
Jason Chiu
3b0a315b40 Update the default split ratio
Test: visual
Fix: 223300824
Change-Id: I574a6255ad0cd77cfae5da682a21408e3022df79
2022-03-17 13:52:04 +08:00
SongFerng Wang
61aa6e999d Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" am: cfb201c400 am: 704147041b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028084

Change-Id: Ieefa077cbd80848d1d8149c71dc384775a807b0d
2022-03-17 05:00:07 +00:00
SongFerng Wang
100d741cc8 Merge "Add the battery information into device details header" am: 907b3fc4be am: 8ca446a175
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028085

Change-Id: Iacf7f957deb9d3f57088c5bd49e2b0ac70cf88f8
2022-03-17 04:59:47 +00:00
SongFerng Wang
704147041b Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" am: cfb201c400
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028084

Change-Id: I639df2d59da6f2793bec3c89751523778f7cf35b
2022-03-17 03:52:28 +00:00
SongFerng Wang
8ca446a175 Merge "Add the battery information into device details header" am: 907b3fc4be
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028085

Change-Id: Id78a0d42672ff4109449951f755ac68f169dab6b
2022-03-17 03:51:56 +00:00
TreeHugger Robot
5f6aee1cf7 Merge "Set higher priority for ADD_DEVICE_ADMIN intent" into tm-dev 2022-03-17 03:44:14 +00:00
Kate Montgomery
4473f60448 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.

Bug: 220837804
Test: manual
Change-Id: Ieebd2e7fd74ab05d4fb73aede6868553d7d84af1
2022-03-17 03:32:03 +00:00
SongFerng Wang
cfb201c400 Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" 2022-03-17 03:11:24 +00:00
SongFerng Wang
907b3fc4be Merge "Add the battery information into device details header" 2022-03-17 03:11:20 +00:00
Yuri Lin
9793acfafd Merge "Remove translatable=false from zen mode people settings footer" into tm-dev 2022-03-16 19:52:49 +00:00
Eric Biggers
6a8f883aee Merge "Remove support for converting from FDE to FBE" am: 804dc16a03 am: 629db5f9f8 am: c749aa3ed1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904

Change-Id: I919c43559218b13c0f6188e04f104f3051a28731
2022-03-16 19:33:25 +00:00