Commit Graph

63847 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
00b488f052 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: eadd54e1d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: Iecff71baa2ef3354cc18f3b8d3598ffe5e58aa37
2020-06-24 06:08:49 +00:00
TreeHugger Robot
eadd54e1d9 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I20545916f5ca886d67e10adf9c68a4656988f27d
2020-06-24 05:52:43 +00:00
TreeHugger Robot
1676454b3b Merge "Fix failed test cases" into rvc-dev 2020-06-24 05:41:14 +00:00
TreeHugger Robot
7890859bec Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab am: 1431d7647a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: I7e61276edaee46ab2a05eb6dcd4d62d49bd380dd
2020-06-24 05:27:17 +00:00
Tim Peng
df46788a5d Apply round corner to the album icon in output switcher panel
Bug: 159766582
Test: manual test
Change-Id: I1535a13c137e9550920cf890c259a4075a2dfc05
2020-06-24 13:17:06 +08:00
TreeHugger Robot
1431d7647a Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: I71f3394e1c44c881a5bc346a59c39a1968d0d29d
2020-06-24 05:10:36 +00:00
TreeHugger Robot
334985feab Merge "Fix com.android.settings.media test case fail" into rvc-dev 2020-06-24 05:01:33 +00:00
Mathew Inwood
bef3383f78 Increase character limit. am: a5c9c0458c am: b9d8b08512
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198

Change-Id: I4f1001a08015128b991d09bd6c850142a923fe95
2020-06-24 04:53:28 +00:00
Mathew Inwood
b9d8b08512 Increase character limit. am: a5c9c0458c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198

Change-Id: If8a2bd69135aa967a87cffc3db19e6d5a25b0be5
2020-06-24 04:41:23 +00:00
Jason Chiu
1b514c3f37 Revert "Workaround of Slice not pinned bug when using SliceCallback"
This reverts commit 73afb042dc.

Reason for revert: Publish the fix in Slice lib and revert the workaround.

Bug: 157387583
Change-Id: Icb150b4f69bffe8af4c3fcb26501020c8fe8432b
2020-06-24 03:53:47 +00:00
Jason Chiu
98a8640de2 Fix failed test cases
Test: robotest
Fixes: 159688624
Change-Id: I28d53e38000d2dfb00bde900647eb38eda279c9a
2020-06-24 10:55:31 +08:00
Hugh Chen
336ff700a2 Fix com.android.settings.media test case fail
Bug: 159760643
Test: make -j42 RunSettingsRoboTests
Change-Id: I17246088ade1b5e17974ccf24a5e40b915146574
2020-06-24 10:54:43 +08:00
Bonian Chen
5faf771722 [Settings] Learn more link should be removed when not supported.
Learn more wording with link only help people when configured.
When no link available, these wording had better removed to avoid from
confusing people.

Bug: 159510116
Test: manual
Change-Id: I36b74b2b4586546090fb88562e8f4f052a877709
2020-06-23 21:19:15 +08:00
Mathew Inwood
a5c9c0458c Increase character limit.
20 is not enough for several languages.

Test: TH
Bug: 159628588
Change-Id: I9f7b47951ea5a4e0eb2022347ebd5ea0db7f0c9e
2020-06-23 14:09:52 +01:00
Arc Wang
cef7d97031 [Wi-Fi] Fix MAC address title information display bug
Use WifiTrackerLib, we can use WifiEntry.getPrivacy()
to get the value for a Passpoint network.

Bug: 159672621
Test: manual visual
      Switch Privacy setting in Wi-Fi detail page, observe
      MAC address title.
Change-Id: I5411e727c5f48dc0d65a05706194569ca3bbebdc
2020-06-23 18:27:51 +08:00
Sarah Chin
19a42896e2 Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c am: b947a7f7bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11959142

Change-Id: Ib76704a907cc570df723825b4de2426b8a9d77d3
2020-06-23 07:29:11 +00:00
Sarah Chin
b947a7f7bf Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11959142

Change-Id: Ia38afb3e20e41135bc5bbd700a9f5500e3df2fd1
2020-06-23 07:01:48 +00:00
Sarah Chin
1d6acb4f8c Merge "Remove NR NSA from voice network type" into rvc-dev 2020-06-23 06:52:12 +00:00
Sarah Chin
4b5e95daa1 Remove NR NSA from voice network type
Since voice calls on NR NSA use LTE, the voice network type
should not be updated to be NR NSA.

Test: manual testing
Bug: 159382203
Change-Id: I77d92fab0020da356ae43293016237be7494c1e2
2020-06-23 06:51:44 +00:00
David Su
9a23c980a5 Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev am: 15d4970c9d am: 46a4938667
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11923937

Change-Id: Id0dfcd8a9eb4db30e977c2ab555599b2186cc595
2020-06-23 03:37:16 +00:00
David Su
46a4938667 Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev am: 15d4970c9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11923937

Change-Id: Ide91f1b4544712f71eb8c1bac843b80bdbdcee49
2020-06-23 03:20:16 +00:00
David Su
15d4970c9d Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev 2020-06-23 03:06:39 +00:00
tim peng
e84006b0de Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev am: 6e10387a38 am: 170179bbe3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931339

Change-Id: I26eb6d76482746eac13e64253731fa7e14215568
2020-06-23 02:55:14 +00:00
tim peng
170179bbe3 Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev am: 6e10387a38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931339

Change-Id: I66017db7ec0e11c06d62628dbb312225b203059d
2020-06-23 02:37:06 +00:00
tim peng
6e10387a38 Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev 2020-06-23 02:22:46 +00:00
Jakub Pawlowski
ecee52a20f [automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419 am: 138dbb86cc -s ours am: 07d3a4de3d -s ours am: b5355ae3be -s ours am: c9310c3156 -s ours am: 0d8a2e0cfe -s ours
am skip reason: Change-Id I99643ee9084f3a9bc1ad9a459ac27c587d832c91 with SHA-1 88815d1456 is in history

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

Change-Id: If481d3e35a48ec83d05dfc554c5994df0e77a7f3
2020-06-22 20:20:27 +00:00