Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,615 Commits 1 Branch 0 Tags
5c8b1c875149ea72edc41af65dae1b3fa185276e
Commit Graph

101615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Hsu
5c8b1c8751 Merge "Add strings for pair other ear dialog." into tm-dev am: 5f3bf16471 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17252805

Change-Id: I376502728d348e030a4c91918c3511b1b19ed706
 2022-03-19 14:11:31 +00:00
Jason Hsu
5f3bf16471 Merge "Add strings for pair other ear dialog." into tm-dev 2022-03-19 14:01:13 +00:00
jasonwshsu
438db974c4 Add strings for pair other ear dialog. 
Dialog shows when only one of the hearing aid device set is connected.

Bug: 225117454
Test: build pass
Change-Id: If7a98c022749f62bf6905ef6ee153037333dd725
 2022-03-19 21:51:38 +08:00
Kholoud Mohamed
74041fbbde [automerger skipped] Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class" into tm-dev am: 51043a1513 am: af10f3f270 -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: If7dadbe1f582b6d6b65197f89a5250d4ddb03ce9
 2022-03-19 06:44:10 +00:00
kholoud mohamed
13d27e7a75 [automerger skipped] RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class am: de78149c16 am: 9693ec41ed -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: I6db6fae06859cba7b23bf2069bdd1f41de03c9bd
 2022-03-19 06:44:01 +00:00
Kholoud Mohamed
af10f3f270 Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class" into tm-dev am: 51043a1513 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182607

Change-Id: If4d83b29d33b390cbc08e34217f741754eea812e
 2022-03-19 06:37:09 +00:00
kholoud mohamed
9693ec41ed RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class am: de78149c16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182607

Change-Id: Icd8f69faf43667745b9c467c23db213a9e928530
 2022-03-19 06:36:59 +00:00
Kholoud Mohamed
629ce0a92b [automerger skipped] Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class" into tm-dev am: 51043a1513 -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: Id5d89009f239ad553b8d796699d547a6672e1b86
 2022-03-19 06:36:57 +00:00
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
Kholoud Mohamed
51043a1513 Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class" into tm-dev 2022-03-19 06:30:10 +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