Commit Graph

101801 Commits

Author SHA1 Message Date
Kweku Adams
6ff3a5e686 Merge "Make action constants configurable." into tm-dev am: 696010b0c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17260256

Change-Id: I1910a7aa9c45398184800f542372685492fc28a8
2022-03-18 22:17:01 +00:00
Kweku Adams
55cdc01a76 Merge "Make action constants configurable." into tm-dev am: 696010b0c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17260256

Change-Id: I36a0737b6233702830bc01b70ebcf37040b538f0
2022-03-18 22:16:54 +00:00
Giulio Fiscella
761fab2027 [automerger skipped] Merge "Use new severity levels and builders" into tm-dev am: d5d6846846 -s ours
am skip reason: Merged-In I9fa4b22e0ca1ca63e75eab427a7beedd95b744da with SHA-1 3612e9e440 is already in history

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

Change-Id: I69ab1a8fc2ad52089b159f495da40cf50b2e68fe
2022-03-18 22:16:42 +00:00
Giulio Fiscella
2d7f940ccd [automerger skipped] Use new severity levels and builders am: 9112567332 -s ours
am skip reason: Merged-In I9fa4b22e0ca1ca63e75eab427a7beedd95b744da with SHA-1 3612e9e440 is already in history

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

Change-Id: I5ed25afdb420f4ba725de1a4dc3f4ce086a8adf3
2022-03-18 22:16:40 +00:00
Giulio Fiscella
74c4655027 [automerger skipped] Merge "Use new severity levels and builders" into tm-dev am: d5d6846846 -s ours
am skip reason: Merged-In I9fa4b22e0ca1ca63e75eab427a7beedd95b744da with SHA-1 3612e9e440 is already in history

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

Change-Id: I5ca48b3a865632acc49a3bda7ad54338cdffa9e6
2022-03-18 22:16:33 +00:00
Giulio Fiscella
bfc3e2ca8f [automerger skipped] Use new severity levels and builders am: 9112567332 -s ours
am skip reason: Merged-In I9fa4b22e0ca1ca63e75eab427a7beedd95b744da with SHA-1 3612e9e440 is already in history

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

Change-Id: I287bb4985b49fd4ebd381d2210d92fddffa1dcd4
2022-03-18 22:16:28 +00:00
Kweku Adams
696010b0c5 Merge "Make action constants configurable." into tm-dev 2022-03-18 22:04:56 +00:00
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
Giulio Fiscella
b492f2fccc Merge "Use new severity levels and builders" into tm-mainline-prod am: 582039b888
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17238283

Change-Id: Icaf8619b467f748a29a4347376e02c298002272b
2022-03-18 12:50:15 +00:00
Giulio Fiscella
582039b888 Merge "Use new severity levels and builders" into tm-mainline-prod 2022-03-18 12:32:10 +00:00
Giulio Fiscella
95e5170354 Merge changes from topic "cherrypick-scIntDefs-s2hgwk1y41"
* changes:
  [automerge] Use new severity levels and builders 2p: 3612e9e440
  Use new severity levels and builders
2022-03-18 12:32:10 +00: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
Bonian Chen
f81eaeb8fa [Settings] Avoid popup activity get bringup from recent history
A popup dialog is designed to sit on top of an single instance activity.
Although activity might #finish(), but will be restarted due to staying
in the recent history.

Remove it from recent history may allow end user not seeing that UI.

Bug: 202033230
Test: local
Change-Id: Id1d52eefb90d011296495f39b1533a1af68435f1
2022-03-18 16:52:40 +08: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
bbab9e1ad6 Merge "Fix NullPointerException at ManageApplications$ApplicationsAdapter.access" into tm-dev am: f8e0b152ad am: 053a2cef0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17125146

Change-Id: I7a12cb73cd02e264ad10a0506e6ae3f5b8b7a192
2022-03-18 06:35:48 +00:00
Arc Wang
053a2cef0c Merge "Fix NullPointerException at ManageApplications$ApplicationsAdapter.access" into tm-dev am: f8e0b152ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17125146

Change-Id: Ieb67e4801430b3657e730de2fbb88714fe87dddb
2022-03-18 06:15:04 +00:00
Arc Wang
a21f277aae Merge "Fix NullPointerException at ManageApplications$ApplicationsAdapter.access" into tm-dev am: f8e0b152ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17125146

Change-Id: Id15bae613192941fbeab31ba7ad8d7044e732370
2022-03-18 06:14:55 +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
Daniel Huang
a027a2e94a Merge "[Panlingual][patch] Settings UI revamp - Navigation handling" 2022-03-18 03:51:56 +00:00
Jason Chiu
6393a30e03 Merge "Update the default split ratio" into tm-dev am: 3b1a9086a7 am: 8fabd76ced
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17226778

Change-Id: Ibf8490a2ffc5f8ec129660d76889b88649338e8a
2022-03-18 03:32:26 +00:00
danielwbhuang
b237247505 [Panlingual][patch] Settings UI revamp - Navigation handling
Fix the logic of checking mPreferenceKey

Bug: 223090378
Test: local
Change-Id: Iea9874463d1786fce2307f3db295ac2bdff27ac3
2022-03-18 03:29:05 +00:00
Jason Chiu
1628c8af0a Merge "Update the default split ratio" into tm-dev am: 3b1a9086a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17226778

Change-Id: I2337d13f1fe18820d3a04bcb0babc2374e2ae923
2022-03-18 03:25:20 +00:00
Jason Chiu
8fabd76ced Merge "Update the default split ratio" into tm-dev am: 3b1a9086a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17226778

Change-Id: I0bfdc83ad10b5f9e028e37411a5a21aec9540909
2022-03-18 03:15:27 +00:00
Jason Chiu
3b1a9086a7 Merge "Update the default split ratio" into tm-dev 2022-03-18 03:12:14 +00:00
Bill Yi
648c6cb277 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c0c5c066f4 -s ours am: 75cce69c9a -s ours am: d953313d3f -s ours am: 72651dd7a2 -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: Ic4a6259578a0be1989cc65a8f75373fc3b3d8280
2022-03-18 03:03:46 +00:00
Bill Yi
465889ad4c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e4e39cee -s ours am: c0e6019a32 -s ours am: da9e66fe71 -s ours am: 697597bbdb -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: I1f2806d0f51b3b0bd570bac301ece1fda4ca6e06
2022-03-18 03:03:45 +00:00
Bill Yi
34164953e4 Merge changes from topic "presubmit-am-38324c67819045d99732392e5fe804f8" into sc-v2-dev-plus-aosp am: 9b874759b1 am: 65bd2f419f am: ec0f48658c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207704

Change-Id: I6e120cd56ad2c42ecc0e7ef9cf7b2dd46e5c3149
2022-03-18 03:03:37 +00:00
Bill Yi
b4223297c5 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d7f03d94b am: ae75e97012 -s ours am: 6adefff78e -s ours am: c2c8dd5df2 -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: Ie892b6a8ece4b643727ea64f22511aee535544bc
2022-03-18 03:03:35 +00:00
Bill Yi
26c92108bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 18cb77b66a -s ours am: 78abbdb6e4 -s ours am: 298650d578 -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: Ib99c1d53c5a69a5433707f74d2ca7663ab2e8ae9
2022-03-18 03:03:25 +00:00
Bill Yi
4f9a502079 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9a68c077f -s ours am: 572d0be27b -s ours am: e786c64db4 -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: Iac5826bfc7387b59f2544f2fc0787a56ceb2ef8b
2022-03-18 03:03:24 +00:00
Bill Yi
12c55d4a0a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0980b77d42 -s ours am: feefbaaec9 -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: I43a3c8476f9a66064817d7f4991cb70c02c1d05f
2022-03-18 03:03:09 +00:00
Bill Yi
72a69d0c56 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1575c5762c -s ours am: c353618b2e -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: I85c247758066b00f6db7beb9e9ccbc567f1b8d8b
2022-03-18 03:03:07 +00:00
Bill Yi
ca976eaba3 Merge changes from topic "presubmit-am-186dac0b6d4f44a59e4bc743cd0fd9b4" into tm-dev am: 2d8cc15ec7 am: e3385a5bc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17206624

Change-Id: I0cfae45baf51d91d5121ceeccbb90238e2a9c82e
2022-03-18 03:02:44 +00:00
Bill Yi
58f84a31ce [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 50710ebebc am: 33db44bfe7 -s ours am: ee1c029095 -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: If61001c4a69d4330f57ee710df6f27ac1ed4870f
2022-03-18 03:02:43 +00:00
Bill Yi
72651dd7a2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c0c5c066f4 -s ours am: 75cce69c9a -s ours am: d953313d3f -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: I23bcad8c2fb359bf76eef121f58b3a8bef2e737a
2022-03-18 03:00:22 +00:00
Bill Yi
817e1e934b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c0abe010c1 -s ours am: c248a78d60 -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: I2f96ec302df3528d097048df1ed1e8fcaa046e9c
2022-03-18 03:00:21 +00:00
Bill Yi
697597bbdb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e4e39cee -s ours am: c0e6019a32 -s ours am: da9e66fe71 -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: Idcc28755f8a4c7ed207f16b0b1e0a90af2765c0b
2022-03-18 03:00:20 +00:00
Bill Yi
7371120da9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e46d423191 -s ours am: 39de788383 -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: Id18f209f0d346202c42331ae2f6fbcb97dea340b
2022-03-18 03:00:19 +00:00
Bill Yi
0893355b82 [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: If65a9f9615a8e60877f279d5a105f0eefab9f6b9
2022-03-18 02:59:59 +00:00
Bill Yi
92e83d7e76 [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: Id5579806c3b9ef8817f145892bbca7a8906e8c95
2022-03-18 02:59:58 +00:00
Bill Yi
ec0f48658c Merge changes from topic "presubmit-am-38324c67819045d99732392e5fe804f8" into sc-v2-dev-plus-aosp am: 9b874759b1 am: 65bd2f419f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207704

Change-Id: Ib7af429a05de931bd79cf8c66b702db4c4e19947
2022-03-18 02:59:45 +00:00
Bill Yi
c2c8dd5df2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d7f03d94b am: ae75e97012 -s ours am: 6adefff78e -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: Ia1405f0de1cb12e5741ab0b6229e90b9ecfd88d6
2022-03-18 02:59:44 +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