PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,953 Commits 1 Branch 0 Tags
c5c92eb34257a79a64d4f44d57c20ebfae5f7d5b
Commit Graph

72953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sunny Shao
8d74809e96 Fix the Night Light page UI shrinking 
- This problem causes the TwilightLocationPreferenceController too late
  to decide the preference display or not.
- Move the display criteria into the getAvailabilityStatus

Fixes: 159032276
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Test: manual review
Change-Id: I5850479e8a891f837c0e6772ad1096e702f95e34
 2020-06-24 12:22:59 +00:00
TreeHugger Robot
c560c18cbd Merge "Update ouput switcher panel height from 6.5 to 5.5 slice items" into rvc-dev am: 3e0102a3cd am: 04652c4210 am: 3961cbf9b1 am: d738146d8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983922

Change-Id: I5354284075492257452802b3eacef1513ee71638
 2020-06-24 11:22:41 +00:00
TreeHugger Robot
c97f7289d5 Merge "Update ouput switcher panel height from 6.5 to 5.5 slice items" into rvc-dev am: 3e0102a3cd am: 6dcf40e1b2 am: 473237f96c am: a00c4049c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983922

Change-Id: I8a6c5bd3df0809d88cded9b8ace8fcab256a7841
 2020-06-24 11:22:23 +00:00
TreeHugger Robot
a498723527 Merge "Update ouput switcher panel height from 6.5 to 5.5 slice items" into rvc-dev am: 3e0102a3cd am: 6dcf40e1b2 am: 15a7853196 am: c943f46b44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983922

Change-Id: If74fd050dd8e228d63ce455f26e37d87971f7dd5
 2020-06-24 11:22:04 +00:00
TreeHugger Robot
d738146d8f Merge "Update ouput switcher panel height from 6.5 to 5.5 slice items" into rvc-dev am: 3e0102a3cd am: 04652c4210 am: 3961cbf9b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983922

Change-Id: I79572d1adfb5aac230e269beae7557315a2a8476
 2020-06-24 11:11:15 +00:00
TreeHugger Robot
a00c4049c2 Merge "Update ouput switcher panel height from 6.5 to 5.5 slice items" into rvc-dev am: 3e0102a3cd am: 6dcf40e1b2 am: 473237f96c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983922

Change-Id: I05a44853770da7a3f1d49b47d9dd57dab63319a2
 2020-06-24 11:11:02 +00:00
TreeHugger Robot
c943f46b44 Merge "Update ouput switcher panel height from 6.5 to 5.5 slice items" into rvc-dev am: 3e0102a3cd am: 6dcf40e1b2 am: 15a7853196 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983922

Change-Id: I0cfc47aec6aecfe329a9b5764840675a1aabfd8c
 2020-06-24 11:10:48 +00:00
TreeHugger Robot
3961cbf9b1 Merge "Update ouput switcher panel height from 6.5 to 5.5 slice items" into rvc-dev am: 3e0102a3cd am: 04652c4210 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983922

Change-Id: I2c35c926f2172859aecca4c3a3a80a11d4e16dd3
 2020-06-24 10:57:54 +00:00
TreeHugger Robot
473237f96c Merge "Update ouput switcher panel height from 6.5 to 5.5 slice items" into rvc-dev am: 3e0102a3cd am: 6dcf40e1b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983922

Change-Id: I08fc52a201d3dc6897d0af5052424dcf76625d4c
 2020-06-24 10:57:44 +00:00
TreeHugger Robot
15a7853196 Merge "Update ouput switcher panel height from 6.5 to 5.5 slice items" into rvc-dev am: 3e0102a3cd am: 6dcf40e1b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983922

Change-Id: I136b846eb3176a8a59a76ff72783d47e56d93caf
 2020-06-24 10:57:24 +00:00
TreeHugger Robot
04652c4210 Merge "Update ouput switcher panel height from 6.5 to 5.5 slice items" into rvc-dev am: 3e0102a3cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983922

Change-Id: Ied14c1c4474ab9a15cbfe4c84486af71e5d8439c
 2020-06-24 10:45:51 +00:00
TreeHugger Robot
6dcf40e1b2 Merge "Update ouput switcher panel height from 6.5 to 5.5 slice items" into rvc-dev am: 3e0102a3cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983922

Change-Id: I145c7acf54d96a9396b4cd965c29577195ab68bd
 2020-06-24 10:45:31 +00:00
TreeHugger Robot
3e0102a3cd Merge "Update ouput switcher panel height from 6.5 to 5.5 slice items" into rvc-dev 2020-06-24 10:29:40 +00:00
Sunny Shao
3c782f7645 SQLiteCursor must be closed before throwing exception 
Fixes: 159694902
Test: manual test
Change-Id: I11b422e90b3155f47f53b4247eacf9f1b424b0ab
 2020-06-24 18:11:13 +08:00
Tim Peng
480409ca7b Add bottom padding in SliceView for output switcher panel 
Bug: 159760833
Test: manual test
Change-Id: Ide1c68da0b5225e3341cd96ff9a786b483c15e5d
 2020-06-24 09:18:50 +00:00
Tim Peng
382f81a570 Update ouput switcher panel height from 6.5 to 5.5 slice items 
-design changes

Bug: 159776397
Test: manual test
Change-Id: I57a343ad6aeeb420d5d9f8eb1cd921a2c8bfa27d
 2020-06-24 17:14:25 +08:00
tim peng
17eaded572 Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26 am: a49b69e54f am: c679982b97 am: 40b1ae5de3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: I51a6cbd480c55bcd5e5a0a04fe110dbc15dfb589
 2020-06-24 08:37:26 +00:00
tim peng
ff75044e06 Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26 am: a49b69e54f am: 2ad6ec534a am: f658ffa193 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: Ia6f7b4be533c8dd9388d1e5e955ecdff05d69bed
 2020-06-24 08:37:02 +00:00
tim peng
40b1ae5de3 Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26 am: a49b69e54f am: c679982b97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: I62058c70f269f17f93b9a411b9e4decf01cd4792
 2020-06-24 08:36:54 +00:00
tim peng
50078dc941 Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26 am: 4d85ce5dce am: eea5c59fbc am: 53aac6be4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: I18f11b4a1a753c70026132c0b80c179d1bbb09a8
 2020-06-24 08:36:40 +00:00
Treehugger Robot
aa995f48f5 [automerger skipped] Merge "Add logic for 5G icon to SIM status dialog" am: 5733d3a31a am: 980a6b8d30 -s ours am: f9b99dcc03 -s ours am: f1c467cba6 -s ours am: d6dc58ba1f -s ours 
am skip reason: Change-Id I764f4ade8032511b44098e7eccb19b909fccc717 with SHA-1 f71eed162d is in history

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

Change-Id: Ief7178cee01106fa268cb892b5951a3de2ae28c9
 2020-06-24 08:36:16 +00:00
tim peng
f658ffa193 Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26 am: a49b69e54f am: 2ad6ec534a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: Ibaa0d5c0bda986cb668a363bd8c69372033ecfda
 2020-06-24 08:26:28 +00:00
tim peng
53aac6be4d Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26 am: 4d85ce5dce am: eea5c59fbc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: I15ec03bbb936f14ae7381b3299ca206a21a4cae1
 2020-06-24 08:26:15 +00:00
tim peng
2ad6ec534a Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26 am: a49b69e54f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: I586b3b93e37c03d27d8b582d2f10f444aa1e7500
 2020-06-24 08:26:04 +00:00
tim peng
c679982b97 Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26 am: a49b69e54f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: I781f348cce1064ca6547eac0697d507cac844fb5
 2020-06-24 08:25:58 +00:00
Treehugger Robot
d6dc58ba1f [automerger skipped] Merge "Add logic for 5G icon to SIM status dialog" am: 5733d3a31a am: 980a6b8d30 -s ours am: f9b99dcc03 -s ours am: f1c467cba6 -s ours 
am skip reason: Change-Id I764f4ade8032511b44098e7eccb19b909fccc717 with SHA-1 f71eed162d is in history

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

Change-Id: I8ef7b1529c9fb1765618e3b8e18041957f4c344b
 2020-06-24 08:25:42 +00:00
tim peng
eea5c59fbc Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26 am: 4d85ce5dce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: Ic83a1b2a4dc180fe1a2e97954e429c90dd6121d5
 2020-06-24 08:10:05 +00:00
tim peng
4d85ce5dce Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: Ie49eabe533e8305456cc04b241596aa7c6de81b7
 2020-06-24 08:05:30 +00:00
tim peng
a49b69e54f Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: I6a80083a72a41831069d1a25afb2f71db3282ca3
 2020-06-24 08:05:29 +00:00
Treehugger Robot
f1c467cba6 [automerger skipped] Merge "Add logic for 5G icon to SIM status dialog" am: 5733d3a31a am: 980a6b8d30 -s ours am: f9b99dcc03 -s ours 
am skip reason: Change-Id I764f4ade8032511b44098e7eccb19b909fccc717 with SHA-1 f71eed162d is in history

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

Change-Id: Iee7a51b34008ec3059d60c7bf2c6082348b73120
 2020-06-24 08:05:04 +00:00
Treehugger Robot
f9b99dcc03 [automerger skipped] Merge "Add logic for 5G icon to SIM status dialog" am: 5733d3a31a am: 980a6b8d30 -s ours 
am skip reason: Change-Id I764f4ade8032511b44098e7eccb19b909fccc717 with SHA-1 f71eed162d is in history

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

Change-Id: I0debb7eb292f2138016f891d973bd7a0435adcff
 2020-06-24 07:50:23 +00:00
tim peng
b6ed02fa26 Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev 2020-06-24 07:45:36 +00:00
Sarah Chin
1017caf120 Remove NR NSA from voice network type 
Since voice calls on NR NSA use LTE, the voice network type
should not be updated to be NR NSA.

Test: manual testing
Bug: 159382203
Change-Id: I77d92fab0020da356ae43293016237be7494c1e2
Merged-In: I77d92fab0020da356ae43293016237be7494c1e2
 2020-06-24 00:40:40 -07:00
Treehugger Robot
980a6b8d30 Merge "Add logic for 5G icon to SIM status dialog" am: 5733d3a31a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347925

Change-Id: Ice4cd34368434361af8220d5af85024708fee2a1
 2020-06-24 07:35:30 +00:00
Treehugger Robot
5733d3a31a Merge "Add logic for 5G icon to SIM status dialog" 2020-06-24 07:18:41 +00:00
Automerger Merge Worker
1ab4281ad0 Merge "Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: 2309e1c188 am: 3261d992cc" into rvc-qpr-dev-plus-aosp am: 8c48773858 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I9998f28f623df8a61120f7847d604d2b6f99b56c
 2020-06-24 06:34:41 +00:00
TreeHugger Robot
800ca3917b Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: eadd54e1d9 am: 00b488f052 am: b9255eec0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I499391bb8e946daf4bf5e70e58b73dae4c2f5a5c
 2020-06-24 06:34:30 +00:00
TreeHugger Robot
17daba9a02 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: eadd54e1d9 am: 0b04a19565 am: 59833aaddb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I0ce4b7c98f7932d1b20893cca503b071eb3bb057
 2020-06-24 06:34:08 +00:00
Automerger Merge Worker
8c48773858 Merge "Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: 2309e1c188 am: 3261d992cc" into rvc-qpr-dev-plus-aosp 2020-06-24 06:21:14 +00:00
TreeHugger Robot
b9255eec0a Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: eadd54e1d9 am: 00b488f052 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: Ic0d25920796acdb6542e83d66ef4568fd041557a
 2020-06-24 06:21:09 +00:00
TreeHugger Robot
ab495ff8e4 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: 2309e1c188 am: 3261d992cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I875da51acfaef3fae15723842ed859bcfdf30395
 2020-06-24 06:21:09 +00:00
TreeHugger Robot
59833aaddb Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: eadd54e1d9 am: 0b04a19565 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I697667e6086ae400b862feed3f2cd46361dad014
 2020-06-24 06:21:03 +00:00
TreeHugger Robot
3261d992cc Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: 2309e1c188 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I1f7b099cc9750618988284b32663de4c236d172f
 2020-06-24 06:09:10 +00:00
TreeHugger Robot
00b488f052 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: eadd54e1d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: Iecff71baa2ef3354cc18f3b8d3598ffe5e58aa37
 2020-06-24 06:08:49 +00:00
TreeHugger Robot
0b04a19565 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: eadd54e1d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I40704bac526083ac5bf5c4fe8255f232e5b842f2
 2020-06-24 06:08:49 +00:00
TreeHugger Robot
b9fc5c829b Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab am: 3882212b26 am: 5a439174e6 am: f52ca40490 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: Iba72807cdd6ecca07bc65f8940156064807386ab
 2020-06-24 05:53:43 +00:00
TreeHugger Robot
cf4dea66bd Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab am: 1431d7647a am: 7890859bec am: 01bd075969 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: I7657c740df6a1e2d7b3c4fb5fff62ae4167cf20f
 2020-06-24 05:53:21 +00:00
TreeHugger Robot
2309e1c188 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I6d889efedeeea69aea2ca8cca5f2f0a9b4c61639
 2020-06-24 05:52:51 +00:00
TreeHugger Robot
5c5f5bdef0 Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab am: 1431d7647a am: 1388e13655 am: 5bd3b9069e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: I949c89b01ebb5e72810c4325370ab4443b9728bc
 2020-06-24 05:52:51 +00:00
TreeHugger Robot
eadd54e1d9 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I20545916f5ca886d67e10adf9c68a4656988f27d
 2020-06-24 05:52:43 +00:00