Mark Chien
4d929f894c
[automerger skipped] Merge "Remove schedule recheck logic from TetherService" am: 9f1fe57bda
am: 3548a5eb0e
-s ours am: f19ef641c8
-s ours
...
am skip reason: Change-Id Ie45859c19b96d0689c45dd610501fae0506742ff with SHA-1 257b9bcdfa
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298536
Change-Id: I38dc3459053c92047a42b89a6e91f2ef9714102c
2020-06-20 03:51:52 +00:00
Tim Peng
aeabfc3050
Add a separate line at the bottom of list area in output switcher
...
-Bottom divider is not showed when there are more than 7 devices exist in output switcher
-Check panel type in isDividerAllowedBelow()
-Hide the Slice bottom divider of Output switcher panel
-Show divider in panel layout only for output switcher panel
Bug: 159177275
Test: make -j42 RunSettingsRoboTests
Change-Id: I49396a0ee0543b494a2b3d714ec248ebab08e7ba
2020-06-20 03:44:43 +00:00
Automerger Merge Worker
0776463298
Merge "Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f
am: d6f41c192f
am: 3e89101ab2" into rvc-qpr-dev-plus-aosp
2020-06-20 03:35:42 +00:00
Akshay Thakker
ebeb999612
Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f
am: d6f41c192f
am: 3e89101ab2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588
Change-Id: Icd62da7e02b3d7db07932b82c95451287a54fc9c
2020-06-20 03:35:38 +00:00
Akshay Thakker
19236d41c4
Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f
am: efbdb099fd
am: b6c41df0f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588
Change-Id: Ia3bb738ba8614dfc300c78fde007f9d81cef865d
2020-06-20 03:35:37 +00:00
Akshay Thakker
7c08d1eeb5
Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f
am: efbdb099fd
am: 491faedab3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588
Change-Id: Iefc3d2724d16e3a2847c312a73404546922a63bf
2020-06-20 03:35:28 +00:00
Mark Chien
f6c4022554
[automerger skipped] Merge "Replace ConnectivityManager as TetheringManager" am: 4064368496
am: ba4af7020c
-s ours
...
am skip reason: Change-Id Id969f29d7210f2ee32719c76439049bbc86cd4f6 with SHA-1 17feecffae
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344637
Change-Id: I1444a5e1d7854252bb9a1a392edc0e9c18d769e2
2020-06-20 03:29:30 +00:00
Mark Chien
f19ef641c8
[automerger skipped] Merge "Remove schedule recheck logic from TetherService" am: 9f1fe57bda
am: 3548a5eb0e
-s ours
...
am skip reason: Change-Id Ie45859c19b96d0689c45dd610501fae0506742ff with SHA-1 257b9bcdfa
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298536
Change-Id: I869f09382784056c9a791fe7ff7296a3b9f9c941
2020-06-20 03:29:20 +00:00
Akshay Thakker
3e89101ab2
Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f
am: d6f41c192f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588
Change-Id: Icf581e34aca42cb3d1df75066b5493c687e9c8d8
2020-06-20 03:22:39 +00:00
Akshay Thakker
b6c41df0f2
Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f
am: efbdb099fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588
Change-Id: I9e0194640b23d84e3745212bd11b05341cb229c7
2020-06-20 03:22:36 +00:00
Akshay Thakker
491faedab3
Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f
am: efbdb099fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588
Change-Id: I5b6f97cdbb0fadd3cc75a27040f2471377e01ef6
2020-06-20 03:22:22 +00:00
SongFerngWang
36796a1616
NetworkModePreference's list needs to allow values set from overlay.
...
Root cause: ag/10614943 removed the resources, so each of item
values is hard coded. This broke the overlay. This CL adds the
resource back so the overlay can work.
Bug: 159301925
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (PASS)
Change-Id: Id5ad2fdd0a87586136e4a26d2e44cf5278df5d9d
2020-06-20 11:21:18 +08:00
Mark Chien
ba4af7020c
Merge "Replace ConnectivityManager as TetheringManager" am: 4064368496
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344637
Change-Id: I9dcb7ee1f1e2c0dfbaf14cf9636b0b153e636cb7
2020-06-20 03:17:33 +00:00
Mark Chien
3548a5eb0e
Merge "Remove schedule recheck logic from TetherService" am: 9f1fe57bda
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298536
Change-Id: If30d8e11f18380b3ab5f2ef840951d550532077a
2020-06-20 03:17:20 +00:00
Jason Chiu
e40dec05e2
Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64
am: 5381571891
am: cfe50a6f60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738
Change-Id: Ifb537b8612bfeab7dea1bdaaf662d4eb67c89ebb
2020-06-20 03:17:10 +00:00
Jason Chiu
bbbcb7ae68
Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64
am: 468e567368
am: 442de5c4dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738
Change-Id: I935d38b45d14252a0a76e048df9e2d7cf339bc35
2020-06-20 03:16:57 +00:00
Jason Chiu
6f8d8e3d05
Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64
am: 5381571891
am: 4a48011fba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738
Change-Id: I4236bdb397c583d278e5b9c7f3f2def1827ae5a3
2020-06-20 03:16:51 +00:00
Akshay Thakker
d6f41c192f
Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588
Change-Id: I8e84d908df0edd77d13579ab95e7aedf3d370d04
2020-06-20 03:10:39 +00:00
Akshay Thakker
efbdb099fd
Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588
Change-Id: I00d9c3ce6b3213de8dd04de38da7e60737c5d5fd
2020-06-20 03:10:27 +00:00
Mark Chien
4064368496
Merge "Replace ConnectivityManager as TetheringManager"
2020-06-20 03:08:37 +00:00
Mark Chien
9f1fe57bda
Merge "Remove schedule recheck logic from TetherService"
2020-06-20 03:08:14 +00:00
Jason Chiu
442de5c4dd
Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64
am: 468e567368
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738
Change-Id: I2c9b54011db4a9269f2cb01539ab5a793783c482
2020-06-20 03:04:39 +00:00
Jason Chiu
4a48011fba
Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64
am: 5381571891
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738
Change-Id: Iad6aac126e058bc6293d0587debb345506e7b643
2020-06-20 03:04:27 +00:00
Jason Chiu
cfe50a6f60
Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64
am: 5381571891
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738
Change-Id: If672ca9668dd95afba4b8d859a7fad2389a45c13
2020-06-20 03:04:24 +00:00
Akshay Thakker
826459695f
Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev
2020-06-20 02:56:49 +00:00
Akshay Thakker
52ac47d9c8
Revert "Fix SecurityException while accessing Slice Uris"
...
This reverts commit 2e790e1859
.
Reason for revert: I accidentally +2'd this CL and it got merged. Sorry about that.
Change-Id: Ia1b2e0a264e16b368601bbb7a32148ec6c183e84
Bug: 159195420
Exempt-From-Owner-Approval: Just a revert
2020-06-20 02:56:09 +00:00
Jason Chiu
468e567368
Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738
Change-Id: I0023e814f8bf3b86ddbcc879427efd5d4038f700
2020-06-20 02:52:16 +00:00
Jason Chiu
5381571891
Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738
Change-Id: I8f016042af7f617ba0cebda0aab717912a7e9225
2020-06-20 02:51:56 +00:00
Tim Peng
c34c5d994b
In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions.
...
-Add "disableRecyclerViewItemAnimator" style to disable animation
Bug: 152605598
Test: manual test
Change-Id: Ibb43231d8734a4f20d13fc014eaa6c9142064e20
2020-06-20 10:44:51 +08:00
Jason Chiu
4b6e900e64
Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev
2020-06-20 02:39:21 +00:00
Automerger Merge Worker
f2ebba9025
Merge changes from topic "am-3bddd89fd6b84d1b8c5e5210dcfc3870" into rvc-qpr-dev-plus-aosp
...
* changes:
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 3ef895694d
am: e9691bdc94
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
am: 43834d78ff
am: 44ce07125a
2020-06-19 22:57:06 +00:00
Automerger Merge Worker
ca5ce305af
Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp am: 0701bcefbc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I605fa7f7c2225713a267a4e60f26461a91e536d9
2020-06-19 22:56:53 +00:00
Beth Thibodeau
87441e00b9
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 5e6f05a533
am: 941a4369d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I7e796e5e1b757d90d8f42ffe4230c3ff5e156db7
2020-06-19 22:56:50 +00:00
Beth Thibodeau
bd62fc7dae
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 3ef895694d
am: e9691bdc94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I0ea0cf9d615041521a5bdbe2de483c8d94cec294
2020-06-19 22:56:49 +00:00
Beth Thibodeau
ae0cf1d24b
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
am: 43834d78ff
am: 44ce07125a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I349e8fc01405d897a9219dd51118d7cf432e5a4a
2020-06-19 22:56:46 +00:00
Beth Thibodeau
2f749ba768
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 3ef895694d
am: 8b9b226bcf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I2c732e309e17767ce72edcd9605cb978c3aa2e76
2020-06-19 22:55:39 +00:00
Beth Thibodeau
e92c41ee14
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
am: 43834d78ff
am: c30c0c381c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I59ea65df35ecc811e22dc57165982634b8806a7a
2020-06-19 22:55:36 +00:00
Automerger Merge Worker
0701bcefbc
Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp
...
* changes:
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 5e6f05a533
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
am: a648d121b7
2020-06-19 22:44:12 +00:00
Beth Thibodeau
941a4369d8
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 5e6f05a533
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: Idd424e240102e9bf2c096711a76d7b60a54884af
2020-06-19 22:44:00 +00:00
Beth Thibodeau
26c5f5082f
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
am: a648d121b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I27e4dc2c479259ec7d0ef5797f2a773d6b22baf9
2020-06-19 22:43:58 +00:00
Beth Thibodeau
8b9b226bcf
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 3ef895694d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I02078c493b6d952b5b52d7accd5b248c77d4e234
2020-06-19 22:43:47 +00:00
Beth Thibodeau
c30c0c381c
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
am: 43834d78ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I2b9690779b8cf6f5e6b8ae6c6dc6f428fb55c3bf
2020-06-19 22:43:44 +00:00
Beth Thibodeau
e9691bdc94
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
am: 3ef895694d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: Iad23f9254826d04f5b8c7f3ff22fa0dc780a27b9
2020-06-19 22:41:18 +00:00
Beth Thibodeau
44ce07125a
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
am: 43834d78ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I90c457110b1bd444e08894560fccba483e2699f9
2020-06-19 22:41:16 +00:00
Beth Thibodeau
5e6f05a533
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: Ib4dfa5a23c490651c0bc540866f4f99e77b70c6d
2020-06-19 22:40:42 +00:00
Beth Thibodeau
a648d121b7
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: Ifed5f6e94045c09bcb5009827c24e668a11ac0a2
2020-06-19 22:40:39 +00:00
Beth Thibodeau
3ef895694d
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I2a1b2ee94f990485cf8f80b98daec71241eca000
2020-06-19 22:40:27 +00:00
Beth Thibodeau
43834d78ff
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: Ib4fffb001ffe58da7e0a9ed759dc75c475b3ae8a
2020-06-19 22:40:24 +00:00
Beth Thibodeau
0b152c29d0
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev
2020-06-19 22:26:59 +00:00
Dan Sandler
9c3cb64e08
Add bubble and shortcut info to notification log debug
...
Bug: 159442644
Test: adb shell am start -n com.android.settings/.Settings\\\$NotificationStationActivity
Change-Id: I5c628ed52bfb44af1cc99ec9fd3dc436fe296344
2020-06-19 15:44:49 -04:00