Commit Graph

62206 Commits

Author SHA1 Message Date
TreeHugger Robot
0a854d7625 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: af5950790a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad9cba32d171f6109ef09f9d100c987cffcd7c48
2020-06-27 05:00:42 +00:00
TreeHugger Robot
af5950790a Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-27 04:47:27 +00:00
Daniel Sandler
efa762ee38 Merge "Add bubble and shortcut info to notification log debug" into rvc-dev am: 5d625e2341
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931358

Change-Id: I9badb63c20a466ead612cc0e0a679015007a1a00
2020-06-26 21:39:05 +00:00
Daniel Sandler
5d625e2341 Merge "Add bubble and shortcut info to notification log debug" into rvc-dev 2020-06-26 21:22:26 +00:00
Jakub Pawlowski
a072267162 [automerger skipped] Prevent overlay drawing on top of Bluetooth discovery request dialog am: ba7f6d7d45 am: c49fcef907 -s ours am: a8eb503247 -s ours am: 2696b1a583 -s ours am: 29f56be69a -s ours
am skip reason: Change-Id I9cee6e5bb8cef77aa385d664fe0738db1496ef20 with SHA-1 c48d63752a is in history

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

Change-Id: I3dc7a523a612c96edba07636c5e064beeafcab9d
2020-06-26 21:08:33 +00:00
Jakub Pawlowski
29f56be69a [automerger skipped] Prevent overlay drawing on top of Bluetooth discovery request dialog am: ba7f6d7d45 am: c49fcef907 -s ours am: a8eb503247 -s ours am: 2696b1a583 -s ours
am skip reason: Change-Id I9cee6e5bb8cef77aa385d664fe0738db1496ef20 with SHA-1 c48d63752a is in history

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

Change-Id: I30588a9209378a5b25667ac5a75ecfdaa8803365
2020-06-26 20:56:05 +00:00
Bill Yi
9055425240 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Icf83136caadca9065b4e3cc03ad45ba6e8fa85f2
2020-06-26 13:47:52 -07:00
Jakub Pawlowski
2696b1a583 [automerger skipped] Prevent overlay drawing on top of Bluetooth discovery request dialog am: ba7f6d7d45 am: c49fcef907 -s ours am: a8eb503247 -s ours
am skip reason: Change-Id I9cee6e5bb8cef77aa385d664fe0738db1496ef20 with SHA-1 c48d63752a is in history

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

Change-Id: I643fbe7ca49ca09847806c2873f249d9e2eb892e
2020-06-26 20:44:35 +00:00
Jakub Pawlowski
a8eb503247 [automerger skipped] Prevent overlay drawing on top of Bluetooth discovery request dialog am: ba7f6d7d45 am: c49fcef907 -s ours
am skip reason: Change-Id I9cee6e5bb8cef77aa385d664fe0738db1496ef20 with SHA-1 c48d63752a is in history

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

Change-Id: Ibae39d4d4f5962e682648e007dd376831574d61c
2020-06-26 20:28:27 +00:00
Jakub Pawlowski
c49fcef907 Prevent overlay drawing on top of Bluetooth discovery request dialog am: ba7f6d7d45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11986974

Change-Id: Ice5a98b7d2c10e9ee62ed20da7aa9213d18a4d8b
2020-06-26 20:06:25 +00:00
TreeHugger Robot
263de56a8d Merge "Revert "Revert "Workaround of Slice not pinned bug when using Sl..."" into rvc-dev am: 15a62defd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12003874

Change-Id: I9d9c01e7ff707dd2024f8d880fdeed7dcea17faa
2020-06-26 16:54:26 +00:00
TreeHugger Robot
15a62defd0 Merge "Revert "Revert "Workaround of Slice not pinned bug when using Sl..."" into rvc-dev 2020-06-26 16:41:52 +00:00
TreeHugger Robot
63cfc7a392 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0743064846 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I67f352d29d97418fe2bc3b9d20b6c33225b6f8f1
2020-06-26 16:14:08 +00:00
TreeHugger Robot
0743064846 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-26 16:02:36 +00:00
TreeHugger Robot
cacad0aca4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8d0f467d19 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25b8a3041270943ceadf942e58667465583d8816
2020-06-26 15:56:44 +00:00
TreeHugger Robot
d16db7980d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 114e03a03c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8f12aeec01c256ce08bce1299409c67bd1811da9
2020-06-26 15:56:37 +00:00
TreeHugger Robot
8d0f467d19 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-26 15:47:22 +00:00
TreeHugger Robot
114e03a03c Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-26 15:39:59 +00:00
Bill Yi
0476ba2351 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I382250623c8d94902321eed292029fbb8a7b8868
2020-06-26 07:30:16 -07:00
Bill Yi
93ac3f385c Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I1922549e1ea3ef21f29e13d3cfadc5744f4568c2
2020-06-26 06:45:51 -07:00
Bill Yi
4884cfacdb Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ic0b9cd30ffc9ba9a25674e137626ec1417745a3c
2020-06-26 06:00:18 -07:00
TreeHugger Robot
850666843a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 00d15c44bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I283ea1cbe2ca7e5f3e99b3964d8e95715da2fd4e
2020-06-26 05:52:23 +00:00
TreeHugger Robot
00d15c44bf Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-26 05:48:00 +00:00
TreeHugger Robot
c9b6ca0cb8 [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: I6e818b02e2c12520117bc2b434c93803bd5299d1
2020-06-26 05:45:59 +00:00
TreeHugger Robot
af16425e89 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-26 05:30:20 +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
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
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
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
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
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
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
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
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
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
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