Alex Li
c8184bbae9
Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95 am: 0567bb7834 am: d5f6a66682 am: 8dc66ef820
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662
Change-Id: I8b61d4f39dc18a105850f5c6e55da25c09019275
2020-06-22 04:50:55 +00:00
Alex Li
d5f6a66682
Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95 am: 0567bb7834
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662
Change-Id: I905797e8477a4d0ea86bb57b8c02bfac95cfb001
2020-06-22 04:24:46 +00:00
TreeHugger Robot
3ab6e990ab
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251 am: 2b697fac94 am: c758384eec am: f339f5a25d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: Ic02e9129f844255524ba8f9f00e3902562b68882
2020-06-22 04:24:46 +00:00
TreeHugger Robot
f339f5a25d
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251 am: 2b697fac94 am: c758384eec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: Id2c6a16fe7318f2627c309b95609eacdc453cfdb
2020-06-22 04:10:58 +00:00
Alex Li
0567bb7834
Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662
Change-Id: I1606b0ae03f46750d0067a9c9abc898dbbfe0c4b
2020-06-22 04:10:37 +00:00
Alex Li
3f8d40bd95
Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev
2020-06-22 03:59:30 +00:00
TreeHugger Robot
009de48ded
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251 am: 2b697fac94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: I77d3bf02a641854f2388fd40704bc590437842e4
2020-06-22 03:54:55 +00:00
TreeHugger Robot
2b697fac94
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: I97fcaa6787a5f9a205e8027d3bfe9d52fa358b6a
2020-06-22 03:44:17 +00:00
TreeHugger Robot
fbabf8f251
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev
2020-06-22 03:27:01 +00:00
alexylli
40b79387cc
[Settings] Avoids disabled component when page start from setup wizard.
...
Fixs when disable component during system busy, the framework have high possibility to force closing activities on the same task.
test
1. setup a pin code and go through to the anything else page. click "control info on lock screen".
>> The SetupRedactionInterstitial not been disabled.
>> The lock screen can be setup repeatedly.
2. into home screen. using adb command to start SetupRedactionInterstitial.
>> the screen not shown.
3. using adb command to start RedactionInterstitial and click "done".
>> the activity existed normally.
Bug: 158961310
Test: Manual
Change-Id: I09fe95db591d3d3603b2c13623a0873bfab3bac0
2020-06-22 09:59:28 +08:00
Arc Wang
fb2b144413
Merge "[Wi-Fi] Apply WifiTrackerLib objects in NetworkRequestDialogFragment"
2020-06-21 14:25:18 +00:00
tim peng
4d956498e4
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: 9ff43d2fa3 am: 593d62d992 am: 826cd4f88f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663
Change-Id: I7caf8d437cfd45979b1e33882c38d65c4fa43f63
2020-06-20 11:05:46 +00:00
tim peng
593d62d992
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: 9ff43d2fa3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663
Change-Id: Ibcab4ea712bcf00fa380c2f449713e6304e766b2
2020-06-20 10:48:25 +00:00
TreeHugger Robot
c7e7463625
Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 74bb0edf99 am: 9c6d33b149 am: d7dbafa800
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344
Change-Id: I99af8c7f3b81be86e3d8b155cf86cb646e9829b6
2020-06-20 10:48:24 +00:00
tim peng
9ff43d2fa3
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663
Change-Id: Ida3ffa1110238057993e4ce345dce3cb3a8791d6
2020-06-20 10:25:04 +00:00
tim peng
02e311e537
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev
2020-06-20 10:12:03 +00:00
TreeHugger Robot
9c6d33b149
Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f am: 74bb0edf99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344
Change-Id: I570056028a1605984de1d0e657bc540a8d6fe045
2020-06-20 10:12:02 +00:00
TreeHugger Robot
74bb0edf99
Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344
Change-Id: Ib482b91a0fc2b10d17150f212b2990ef753347a1
2020-06-20 09:57:03 +00:00
TreeHugger Robot
cab1329f0f
Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev
2020-06-20 09:42:23 +00:00
Mill Chen
a99b8799ee
Make Telephony related PreferenceController un-sliceable
...
Since the structure of Telephony is changed, some of Telephony
related PreferenceController cannot be converted to slices
smoothly whether devices have mobile data or not. So we
decided to make them un-sliceable.
Bug: 155846002
Test: robotests, manual
1. Settings -> Settings search -> search for roaming
2. Check that roaming result has no toggle widget.
Change-Id: I7cba8f6a750d9780a59411942665f68dac61248c
2020-06-20 08:20:07 +00:00
Jason Chiu
ad9a214fff
Revert "Revert "Fix SecurityException while accessing Slice Uris""
...
This reverts commit 52ac47d9c8 .
Reason for revert: This CL is what we wanted to merge in RVC and has already got Code-Review +2, Owner-Approval, and DrNo-Review from other folks regardless of the accident.
Bug: 159195420
Change-Id: I6c646269cd3e13e015dcc06418e21db66372e680
2020-06-20 07:04:52 +00:00
TreeHugger Robot
229e76ec19
Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 731e6d8e5f am: d9d63ebea6 am: 33e5429474
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541
Change-Id: I0254419c2d5f1b6ac97afbbde0b06fdd696feedd
2020-06-20 05:08:27 +00:00
TreeHugger Robot
33e5429474
Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 731e6d8e5f am: d9d63ebea6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541
Change-Id: I24a7976f0928ddf8fb4755a57b6659393164f91b
2020-06-20 04:57:22 +00:00
TreeHugger Robot
58c4a5bf48
Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8 am: 731e6d8e5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541
Change-Id: Ia862cf87cf256805fb0b6ab27101cdfc41614778
2020-06-20 04:56:28 +00:00
TreeHugger Robot
731e6d8e5f
Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541
Change-Id: I924680694eb54be8e4447e873aa195aa1f5c19c4
2020-06-20 04:43:49 +00:00
TreeHugger Robot
5b849d8ac8
Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev
2020-06-20 04:35:24 +00:00
Akshay Thakker
a14e7f365e
Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: efbdb099fd am: 491faedab3 am: 7c08d1eeb5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588
Change-Id: I6761fb2d312c5cbe5ae968b33fe692dde6e6cf5a
2020-06-20 03:51:29 +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
Jason Chiu
7c28e2c1cf
Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891 am: 4a48011fba am: 6f8d8e3d05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738
Change-Id: I05297cf55d085fc8da614fda650e0e7ab08e11cf
2020-06-20 03:28:58 +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
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
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
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
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
Jason Chiu
4b6e900e64
Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev
2020-06-20 02:39:21 +00:00
Kevin Chyn
95e05d8d07
Merge "Remove setActiveUser together with frameworks/base (see 12/n)"
2020-06-20 01:02:24 +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
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
TreeHugger Robot
992d31cd03
Merge "Add BatteryStatusFeatureProvider"
2020-06-19 14:02:13 +00:00
TreeHugger Robot
c4471d716b
Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 5b5c335b01 am: 74a89fb9fd am: 01d0ea7443
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592
Change-Id: Iadd7046da7869a864db428f78a122a250d8f98c3
2020-06-19 13:29:13 +00:00
TreeHugger Robot
74a89fb9fd
Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1 am: 5b5c335b01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592
Change-Id: If0cb802f53b37094ebc66d26e625a514f9d77ebb
2020-06-19 13:02:11 +00:00
TreeHugger Robot
5b5c335b01
Merge "Improved UX when no debuggable apps are available." into rvc-dev am: 6217af3fe1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11675592
Change-Id: I650b4a287132e3b6b8c8dce5f7f88cdc148d08ad
2020-06-19 12:48:41 +00:00
TreeHugger Robot
6217af3fe1
Merge "Improved UX when no debuggable apps are available." into rvc-dev
2020-06-19 12:32:52 +00:00
Arc Wang
97659b2dfc
[Wi-Fi] Apply WifiTrackerLib objects in NetworkRequestDialogFragment
...
Bug: 152571756
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ie6f63cb8aa81d61bfa41687c73f8c8764cb3cefe
2020-06-19 19:15:42 +08:00
Yanting Yang
e51c4b3699
Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: bd27683632 am: 570f8e54f7 am: d208cb29c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540
Change-Id: I8c39949c17ce96758779fa806328e00f949b8149
2020-06-19 08:41:06 +00:00
Yanting Yang
570f8e54f7
Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: bd27683632
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540
Change-Id: I0cebc3bef3647df08ab11e4d0886654bc300c265
2020-06-19 08:16:46 +00:00
Yanting Yang
bd27683632
Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540
Change-Id: I021a1ef7170000c297e83a806d3272456011da2c
2020-06-19 08:00:14 +00:00