PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,606 Commits 1 Branch 0 Tags
387727d2986fa67f49f6540eb6f048ccb6a0e88c
Commit Graph

101606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kholoud mohamed
387727d298 [automerger skipped] RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class am: de78149c16 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8169536c29891ba5d19ed30396f43b74fead91e
 2022-03-19 06:36:46 +00:00
Bill Yi
b2d45ce204 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-03-19 03:02:47 +00:00
TreeHugger Robot
7bd04e3469 Merge "Hide emergency setting from "Search settings"" into tm-dev am: 70e2ed1b9d am: 4f45c5cb60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252529

Change-Id: I6c6ddaf44c125dd6c132bf2d7d41b59e27dca5a1
 2022-03-19 02:54:44 +00:00
TreeHugger Robot
4f45c5cb60 Merge "Hide emergency setting from "Search settings"" into tm-dev am: 70e2ed1b9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252529

Change-Id: I83478f5d399adaa63d41e868d23b1fab8e43e97d
 2022-03-19 02:39:23 +00:00
TreeHugger Robot
beb1fdc345 Merge "Hide emergency setting from "Search settings"" into tm-dev am: 70e2ed1b9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252529

Change-Id: Ie27bb45432f30b16e2045b87c89901eeda327b2a
 2022-03-19 02:39:13 +00:00
TreeHugger Robot
70e2ed1b9d Merge "Hide emergency setting from "Search settings"" into tm-dev 2022-03-19 02:22:59 +00:00
Treehugger Robot
ef23f9ba15 Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862 am: 0b28adfd8e am: bbb9db4149 am: 4463829319 am: 76c6ece6e5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626

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

Change-Id: Ibe16375f0627a6f851b7dd4ffc207c1842be0420
 2022-03-19 00:48:36 +00:00
Giulio Fiscella
0543f2f0e0 [automerger skipped] Merge "Use new severity levels and builders" into tm-dev am: d5d6846846 -s ours am: 761fab2027 -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: I28706a4dc1e809b1d951ffa8da8689a1789180e2
 2022-03-19 00:43:44 +00:00
Giulio Fiscella
0c5d0d3e1f [automerger skipped] Use new severity levels and builders am: 9112567332 -s ours am: 2d7f940ccd -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: I60b8c2877aa9b83cff5fcbef6e8665b6ed5c24bc
 2022-03-19 00:43:41 +00:00
Treehugger Robot
9448fe3278 Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862 am: 0b28adfd8e am: bbb9db4149 am: 4463829319 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626

Change-Id: Ia24ee9964b2f5eed87add34af4bdaa87b75ca708
 2022-03-18 23:42:53 +00:00
Treehugger Robot
76c6ece6e5 Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862 am: 0b28adfd8e am: bbb9db4149 am: 4463829319 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626

Change-Id: Idebb078b5ebaf953181ce31eb501262f902cc9af
 2022-03-18 23:42:33 +00:00
Treehugger Robot
4463829319 Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862 am: 0b28adfd8e am: bbb9db4149 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626

Change-Id: Ibe6ef9677e7892448000bb2d83501258dacd57d9
 2022-03-18 23:24:19 +00:00
Treehugger Robot
bbb9db4149 Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862 am: 0b28adfd8e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626

Change-Id: Ie97da8acc7f25ae088d9ef36932aeb93be30b7cd
 2022-03-18 23:11:21 +00:00
Treehugger Robot
0b28adfd8e Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626

Change-Id: I34c53ca0500252de1245691e403327f470d0e293
 2022-03-18 22:55:36 +00:00
Treehugger Robot
2f4962c862 Merge "Add null check for mChannel object in WifiP2Settings" 2022-03-18 22:38:19 +00:00
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
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
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
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