Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,748 Commits 1 Branch 0 Tags
d58ca93fd0a98b9596edf3cd75103c278fdca483
Commit Graph

73748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
d58ca93fd0 Merge "Merge "Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: 826e63f47a" into rvc-d1-dev-plus-aosp am: 8fea5708f5" into rvc-qpr-dev-plus-aosp am: 94d45c4800 am: e74faa8aee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983925

Change-Id: I6a9bfcfe21612c5a047278ba690175b9dd9f9465
 2020-06-24 13:47:03 +00:00
TreeHugger Robot
195fd2cdd9 Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: 826e63f47a am: 490cf9c1c3 am: 860b59d252 am: a59dd0b72b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983925

Change-Id: I1912100c097d8e0a570287b3f389d5c2d57dbd30
 2020-06-24 13:46:56 +00:00
Automerger Merge Worker
5ce00a6be6 Merge "Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 35d0304067 am: 5784bbd8b2" into rvc-qpr-dev-plus-aosp am: dc8f57f4b5 am: 41aea005dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: Iaccc858136d6b92e14605f053aa72183b34e0aea
 2020-06-24 13:46:51 +00:00
TreeHugger Robot
45fa1dfc04 Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 821d3a21f1 am: a12e479403 am: 5cfe658988 am: e929104d7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: Ib2be7e58f9cad608ca17855042594e5c9a16c685
 2020-06-24 13:46:43 +00:00
TreeHugger Robot
fac18e89be Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 35d0304067 am: adb65f0f4e am: bd06683934 am: 952816df60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: Ie78ee6a05d27dc2bb20354186ce397195ef43860
 2020-06-24 13:46:33 +00:00
Automerger Merge Worker
e74faa8aee Merge "Merge "Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: 826e63f47a" into rvc-d1-dev-plus-aosp am: 8fea5708f5" into rvc-qpr-dev-plus-aosp am: 94d45c4800 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983925

Change-Id: I16e9ce1d8f37356a9453a1a992cae5c7b3caf1b7
 2020-06-24 13:34:04 +00:00
TreeHugger Robot
a59dd0b72b Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: 826e63f47a am: 490cf9c1c3 am: 860b59d252 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983925

Change-Id: I8ffe35c06d1bdb2f70709927b97c1677ed419456
 2020-06-24 13:33:53 +00:00
Automerger Merge Worker
41aea005dc Merge "Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 35d0304067 am: 5784bbd8b2" into rvc-qpr-dev-plus-aosp am: dc8f57f4b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: I25bad13ae689d54484e960a0e7cfde55aab6e3e9
 2020-06-24 13:33:45 +00:00
TreeHugger Robot
e929104d7e Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 821d3a21f1 am: a12e479403 am: 5cfe658988 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: I0db196defc91ba1c647ba6c6564c23f18485854d
 2020-06-24 13:33:32 +00:00
TreeHugger Robot
952816df60 Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 35d0304067 am: adb65f0f4e am: bd06683934 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: I907eeff27eb2bc685e08fa4d41e6cca73276c3ef
 2020-06-24 13:33:23 +00:00
Automerger Merge Worker
94d45c4800 Merge "Merge "Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: 826e63f47a" into rvc-d1-dev-plus-aosp am: 8fea5708f5" into rvc-qpr-dev-plus-aosp 2020-06-24 13:14:18 +00:00
Automerger Merge Worker
21818688da Merge "Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: 826e63f47a" into rvc-d1-dev-plus-aosp am: 8fea5708f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983925

Change-Id: I524d4fea38b1a89be15128dc6c30e189e7701cce
 2020-06-24 13:14:13 +00:00
TreeHugger Robot
860b59d252 Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: 826e63f47a am: 490cf9c1c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983925

Change-Id: I4692b5d64839838682989d0f349b70b63e49dc3d
 2020-06-24 13:14:12 +00:00
Automerger Merge Worker
dc8f57f4b5 Merge "Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 35d0304067 am: 5784bbd8b2" into rvc-qpr-dev-plus-aosp 2020-06-24 13:14:07 +00:00
TreeHugger Robot
5cfe658988 Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 821d3a21f1 am: a12e479403 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: Ie4a7137a3e4b9ea5d3c47d8bf9daf85f132b0b49
 2020-06-24 13:14:01 +00:00
TreeHugger Robot
cb1e32b7fc Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 35d0304067 am: 5784bbd8b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: Ie76ed2bbe8dcdd22d3aace957f8802dec16bef08
 2020-06-24 13:13:58 +00:00
TreeHugger Robot
bd06683934 Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 35d0304067 am: adb65f0f4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: If99a75e45df892066ab979cbfb890543350ff4be
 2020-06-24 13:13:46 +00:00
Automerger Merge Worker
8fea5708f5 Merge "Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: 826e63f47a" into rvc-d1-dev-plus-aosp 2020-06-24 13:01:39 +00:00
TreeHugger Robot
490cf9c1c3 Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: 826e63f47a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983925

Change-Id: I75db1c3f51c42299f9997acf03f5092c1a48c719
 2020-06-24 13:01:33 +00:00
TreeHugger Robot
a12e479403 Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 821d3a21f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: I82b5cd9c1710b96dff986a094e17a11945b830c3
 2020-06-24 13:01:33 +00:00
TreeHugger Robot
2b1fd1fe97 Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: 826e63f47a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983925

Change-Id: I62217fe448ac01f560ad9de23b53aa93ac388f4e
 2020-06-24 13:01:33 +00:00
TreeHugger Robot
5784bbd8b2 Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 35d0304067 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: I6fbf11cc2e43517afe2d486c7fe4fb5e30590d0c
 2020-06-24 13:01:21 +00:00
TreeHugger Robot
adb65f0f4e Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 am: 35d0304067 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: I21d2303110af212bceed2855e671aec1e394f166
 2020-06-24 13:01:18 +00:00
TreeHugger Robot
826e63f47a Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983925

Change-Id: Ib6acbda99a2ff25ab600ac016d765f76a4dcea94
 2020-06-24 12:47:41 +00:00
TreeHugger Robot
2d3f5ecd4a Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev 2020-06-24 12:45:38 +00:00
TreeHugger Robot
821d3a21f1 Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: I9ef98879c2581fbe8bf0c466a43ebe6602e3ed7f
 2020-06-24 12:43:25 +00:00
TreeHugger Robot
35d0304067 Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: I91ffd5a10cf3b583d8a645951550a11e49891366
 2020-06-24 12:43:23 +00:00
TreeHugger Robot
6f4aa6e5e0 Merge "Fix the Night Light page UI shrinking" into rvc-dev 2020-06-24 12:24:02 +00:00
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
4efddd58c4 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 am: c560c18cbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983922

Change-Id: I3113e048721d98eafbe7a60f1915e96c5adc574e
 2020-06-24 11:36:34 +00:00
TreeHugger Robot
c97f20a0b2 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 am: c97f7289d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983922

Change-Id: I846ab18ca29a41c01ea5c72044d8ee22d46d6953
 2020-06-24 11:36:08 +00:00
TreeHugger Robot
49fa891a27 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 am: a498723527 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983922

Change-Id: Ie5e89f059f1256d22efd99e54e65a1774963f998
 2020-06-24 11:35:48 +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
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
2b3664a8fe Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26 am: a49b69e54f am: c679982b97 am: 40b1ae5de3 am: 17eaded572 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

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

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

Change-Id: I190d8a71e6d1b2c4e1371251583ff0257adb7497
 2020-06-24 08:55:30 +00:00
Treehugger Robot
43174869c0 [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: aa995f48f5 -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: I2d367d1c98bf5d619ce3361fc5f5fd81cbd493e7
 2020-06-24 08:54:46 +00:00