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
Sarah Chin
1017caf120
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
Merged-In: I77d92fab0020da356ae43293016237be7494c1e2
2020-06-24 00:40:40 -07: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
Treehugger Robot
5733d3a31a
Merge "Add logic for 5G icon to SIM status dialog"
2020-06-24 07:18:41 +00:00
TreeHugger Robot
2309e1c188
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: I6d889efedeeea69aea2ca8cca5f2f0a9b4c61639
2020-06-24 05:52:51 +00:00
TreeHugger Robot
1676454b3b
Merge "Fix failed test cases" into rvc-dev
2020-06-24 05:41:14 +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
3882212b26
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: I48656a2ca05350bec1d304a05fbb00ff99b137d7
2020-06-24 05:10:32 +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
93c232993e
Increase character limit. am: a5c9c0458c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198
Change-Id: Ifc81b836b436ebd7b4b6bcf498085ecd9a3c603e
2020-06-24 04:40:52 +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
Sarah Chin
de62ae7ff4
Add logic for 5G icon to SIM status dialog
...
Test: manual test with fake 5G data network type
Bug: 156815536
Change-Id: I764f4ade8032511b44098e7eccb19b909fccc717
Merged-In: I764f4ade8032511b44098e7eccb19b909fccc717
2020-06-23 15:32:07 -07: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
89cc02986e
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: I897c462e15c97a5b50c528121c77e2fb2b115a38
2020-06-23 07:01:22 +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
b426b12967
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: I7769481eb333964dfe71f88d5faf2b15e4d375b7
2020-06-23 03:20:26 +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
0217b38b00
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: Ie69913e09a49438c85e6266f0a7d948b9b459460
2020-06-23 02:37:25 +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
431033f9ea
[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 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: I2b646bd53af7b3d8506260495439988b77cbd87d
2020-06-22 20:06:25 +00:00
Jakub Pawlowski
c9310c3156
[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 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: I205f4af442741edeb0295bd713bef68f5ddccaa5
2020-06-22 19:54:45 +00:00
Jakub Pawlowski
b5355ae3be
[automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419
am: 138dbb86cc
-s ours am: 07d3a4de3d
-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: I99e7d95f10f5f3d76ef18ab198464fe0b8289a8c
2020-06-22 19:38:34 +00:00
Jakub Pawlowski
07d3a4de3d
[automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419
am: 138dbb86cc
-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: I19f322dfbc23f34fcf736215f46fd41f2dd0b570
2020-06-22 19:19:47 +00:00
Jakub Pawlowski
138dbb86cc
Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11953485
Change-Id: I41bd60685dc58028a328c041ca4532b42881cec7
2020-06-22 19:03:01 +00:00