TreeHugger Robot
400e736767
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: af16425e89
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006109
Change-Id: I80d2186e05a139ddb8106c3539fbb44735b65159
2020-06-26 05:45:53 +00:00
TreeHugger Robot
af16425e89
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-26 05:30:20 +00:00
Joshua Duong
d683d25f47
[qrcode] Open any available camera if back camera isn't available.
...
Bug: 159956551
Test: make RunSettingsRoboTests ROBOTEST_FILTER=QrCameraTest
Change-Id: I2aa01330c8d12c478f8392f66359131638590b77
2020-06-25 22:16:33 -07:00
TreeHugger Robot
33e7c35d2f
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94
am: c7683448f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206
Change-Id: I120ea4e5a3815d4ef665a3d2686f6a61912bad60
2020-06-26 04:05:25 +00:00
TreeHugger Robot
90d1b94c90
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94
am: 7d20757118
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206
Change-Id: If0538a0f9b7fb4f1f561764de0293b3cb840f910
2020-06-26 04:04:29 +00:00
TreeHugger Robot
c7683448f1
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206
Change-Id: I8da054d703c2e392c365a84763eb50c8179c3f82
2020-06-26 03:44:38 +00:00
TreeHugger Robot
7d20757118
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206
Change-Id: I733e3271f14ccadea76736043af88c8be4e62298
2020-06-26 03:44:32 +00:00
Jay Aliomer
d96f81ac8c
Change the order of dark theme options to match night light
...
Fixes: 159030764
Test: manually go to display -> dark theme
Change-Id: I71ab1d0699a9c7a4a873453321a3dca640a892b9
2020-06-25 23:30:38 -04:00
TreeHugger Robot
7a97493f94
Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev
2020-06-26 03:25:46 +00:00
Bill Yi
fe9fb7b786
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I89c6ac21f9325fc08f84280ea09cac02641c9e33
2020-06-26 02:08:29 +00:00
Bill Yi
0b6df85dc2
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Idbafda711199ef3fde5bd6beee3422eb8a2694bb
2020-06-26 01:30:25 +00:00
Andrii Kulian
f11088a886
Revert "Revert "Workaround of Slice not pinned bug when using Sl..."
...
Revert "Import AndroidX from build 6620107"
Revert submission 11970208-update_slice_view
Reason for revert: b/159943588
Reverted Changes:
Id09f4f6aa:Import AndroidX from build 6620107
Icb150b4f6:Revert "Workaround of Slice not pinned bug when us...
Bug: 157387583
Bug: 159943588
Change-Id: Iedd9883ea144395b9d4afb011a218fe5dcb6b560
2020-06-25 23:50:53 +00:00
Automerger Merge Worker
3ae447fac8
Merge "Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26
am: 6983516124" into rvc-d1-dev-plus-aosp
2020-06-25 18:14:22 +00:00
TreeHugger Robot
cb6694fceb
Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26
am: 6983516124
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208
Change-Id: I9e03c8066fb014c5d23e5f62245e58e8a09dcb09
2020-06-25 18:14:17 +00:00
TreeHugger Robot
134254ee2b
Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26
am: 0d26f24dbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208
Change-Id: I443d14c0bc5a2003719de13c230ba957795d263d
2020-06-25 18:14:14 +00:00
TreeHugger Robot
0d26f24dbf
Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208
Change-Id: Ibf305c1ffb9e687d0b5c02e2ffab90b7d9212743
2020-06-25 18:00:48 +00:00
TreeHugger Robot
6983516124
Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208
Change-Id: I058262a8dc2df77c41f1a4621a16b12b3ac3b3d9
2020-06-25 18:00:36 +00:00
TreeHugger Robot
77dcc34b26
Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev
2020-06-25 17:19:44 +00:00
Jakub Pawlowski
ba7f6d7d45
Prevent overlay drawing on top of Bluetooth discovery request dialog
...
Bug: 155650356
Change-Id: I9cee6e5bb8cef77aa385d664fe0738db1496ef20
Merged-In: I9cee6e5bb8cef77aa385d664fe0738db1496ef20
(cherry picked from commit ac67100423
)
2020-06-24 19:02:54 +00:00
TreeHugger Robot
5b199b3e1b
Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd
am: 1230f90999
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888
Change-Id: I2f4e898413f9622649192d90163d9e3e9470ac07
2020-06-24 18:29:16 +00:00
TreeHugger Robot
a7973d6b40
Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd
am: 1172dcd5be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888
Change-Id: Icabaf7cd378c5c8ce624d40f74cdd2e8af234662
2020-06-24 18:23:12 +00:00
TreeHugger Robot
1230f90999
Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888
Change-Id: I528105c4e1fd7eba294f6bcd7f735711a63c7e12
2020-06-24 18:10:56 +00:00
TreeHugger Robot
1172dcd5be
Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888
Change-Id: Ifab97862a30669ca741d7527092905ea8c777b37
2020-06-24 18:10:40 +00:00
TreeHugger Robot
1b57d227bd
Merge "Increase char limit for translations" into rvc-dev
2020-06-24 17:59:39 +00:00
Beth Thibodeau
5e402df833
Increase char limit for translations
...
Fixes: 159629315
Test: compiles; comment change only
Change-Id: I59a72a2de26cdb33002138ba0e9eaf4e58ecd3c1
2020-06-24 12:03:06 -04: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
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
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
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
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
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
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