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
TreeHugger Robot
edc59dbe5b
Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a
am: e4cda91ccd
am: 78cd92a48e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983925
Change-Id: I032fc748193370853069e02ca414cd5c42fa177d
2020-06-24 13:14:21 +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
TreeHugger Robot
78cd92a48e
Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a
am: e4cda91ccd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983925
Change-Id: I6a4652b7b6f9f8c87df9ca82e0cee666a98131d2
2020-06-24 13:01:41 +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
e4cda91ccd
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: I47f121643c93d9ae4934bf1f537c45ea11101c32
2020-06-24 12:47:36 +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
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