Commit Graph

69644 Commits

Author SHA1 Message Date
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
TreeHugger Robot
2077575fc3 Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 0d26f24dbf am: 88b88439a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208

Change-Id: I332416dc1746113e637e687ef0e0b3149573dac3
2020-06-25 18:26:05 +00:00
Automerger Merge Worker
bfed274495 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 am: 3ae447fac8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208

Change-Id: I486fbac541d9f515f131fff5af7fb65e66416e60
2020-06-25 18:25:44 +00:00
TreeHugger Robot
61a2186e89 Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b26 am: 0d26f24dbf am: 134254ee2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970208

Change-Id: I103593c76f3968ca9e5d77ee02cfdbb67819aa4a
2020-06-25 18:25:23 +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
88b88439a5 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: If0a64a5a2e31e18b735434d2ae7ae35dcfb75f79
2020-06-25 18:13:36 +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
239e85e5ba Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1230f90999 am: 1a499b0fe6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888

Change-Id: I5e621eadc6f6d65b46a27e3e9462ca07d2797c16
2020-06-24 18:40:40 +00:00
TreeHugger Robot
2b836447a0 Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1230f90999 am: 5b199b3e1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888

Change-Id: Id780eb12a2500866fbe4cc1ebb956d61362a0dea
2020-06-24 18:34:48 +00:00
TreeHugger Robot
24bae851a4 Merge "Increase char limit for translations" into rvc-dev am: 1b57d227bd am: 1172dcd5be am: a7973d6b40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11987888

Change-Id: Ic12249225eab906eb0700ea44f683572938f28b5
2020-06-24 18:34:22 +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
1a499b0fe6 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: I9cc82154ea1efb0d2d9d5c6648a7fa03f2a7f3ca
2020-06-24 18:29:14 +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
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
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