Youming Ye
b7923f5a3f
Check the missing useHomeWfMode case
...
Bug: 133812904
Test: Build
Change-Id: If89c67c0595808a1339517c6084f1d1e23f5974b
Merged-In: If89c67c0595808a1339517c6084f1d1e23f5974b
2019-07-31 16:38:32 -07:00
Antony Sargent
fa99ea7dc6
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9 am: ad2f49f851
...
am: bf2c5ce274
2019-07-31 16:35:58 -07:00
Bill Yi
58ff9ea4d5
[automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c -s ours am: 1ccff0ddc6 -s ours
...
am: 1aef5e268e
2019-07-31 16:26:41 -07:00
Antony Sargent
afb537f589
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9
...
am: e744ee1295
2019-07-31 16:24:14 -07:00
Bill Yi
f3eb3758eb
[automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c -s ours
...
am: f580528464
2019-07-31 16:07:46 -07:00
Antony Sargent
bf2c5ce274
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9
...
am: ad2f49f851
2019-07-31 16:06:59 -07:00
Bill Yi
1aef5e268e
[automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c -s ours
...
am: 1ccff0ddc6
2019-07-31 16:05:53 -07:00
Antony Sargent
2e04fe31a3
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9
...
am: ad2f49f851
2019-07-31 16:05:35 -07:00
Antony Sargent
e744ee1295
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
...
am: 4685c785b9
2019-07-31 16:04:54 -07:00
Bill Yi
64512eb053
[automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c -s ours
...
am: 1ccff0ddc6
2019-07-31 16:04:50 -07:00
Quang Luong
c2e859edee
Merge "Copy WifiSettings base code into WifiSettings2 without WifiTracker"
2019-07-31 23:03:31 +00:00
Antony Sargent
ad2f49f851
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
...
am: 4685c785b9
2019-07-31 15:56:00 -07:00
Bill Yi
1ccff0ddc6
[automerger skipped] Import translations. DO NOT MERGE
...
am: 5a690f3c4c
2019-07-31 15:53:52 -07:00
Bill Yi
f580528464
[automerger skipped] Import translations. DO NOT MERGE
...
am: 5a690f3c4c
2019-07-31 15:53:13 -07:00
TreeHugger Robot
4685c785b9
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
2019-07-31 22:39:22 +00:00
Antony Sargent
482415d37e
Protect entry points to add an eSIM when admin restricted
...
If the DISALLOW_CONFIG_MOBILE_NETWORKS admin policy is set, we were
accidentally still allowing access to the flow where you add an eSIM
subscription via the "plus" button on the Network & internet page. While
fixing this, I also noticed that the mobile networks list page (which
only becomes available if you have multiple subscriptions) has a link at
the bottom to start the flow as well, and that wasn't being protected.
The fix for the plus button on the Network & internet page was just to
make sure not to call setEnabled(true) if the preference was already
disabled by admin policy, since that has the effect of overriding the
admin-disabling.
The fix for the mobile networks list page just needed to add the
relevant tags in the layout XML, and then we get it for free.
Fixes: 137627845
Test: make RunSettingsRoboTests
Change-Id: I896ac248f50aaeecc157791938a0a0a98265aa07
2019-07-31 12:53:39 -07:00
Daniel Solomon
56574d5924
Settings: change the color mode preview image
...
Change the color mode preview image to better illustrate the difference
between Natural and Boosted color modes.
Bug: 138126243
Test: manual testing on Pixel
Change-Id: I367b383f9f2da9b2e2d5960e51c3ec7821d4915b
2019-07-31 12:48:23 -07:00
Bill Yi
5a690f3c4c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I3e51c61d9bdff182bc83a04242ccd6e1e4f9629d
2019-07-31 12:09:08 -07:00
Quang Luong
b061428938
Copy WifiSettings base code into WifiSettings2 without WifiTracker
...
Copied main logic from WifiSettings into WifiSettings2, removing
all instances of WifiTracker in preparation of adding WifiTracker2.
Removed:
- WifiDialog (to be added back in)
- Context Menu (to be added back in)
- Leftover SUW code (Next button)
WifiSettings2Test also copied directly from WifiSettingsTest, without
context menu test.
Bug: 70983952
Test: atest WifiSettings2Test
Change-Id: Ie1ef5bf0ca14f5989f4add2165422609f12c2c84
2019-07-31 11:46:15 -07:00
Raff Tsai
a64c7b2698
Merge "Fix Settings crash when click uninstall button"
2019-07-31 01:16:47 +00:00
Quang Luong
48a8fbbd9c
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f am: 815af2ba6e
...
am: 89a61d9374
2019-07-30 17:41:23 -07:00
Quang Luong
a5c8edb46f
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f am: 5c4a0e3444
...
am: b66a8c86a4
2019-07-30 17:37:41 -07:00
Quang Luong
dc74124232
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f
...
am: 5c4a0e3444
2019-07-30 17:35:06 -07:00
Quang Luong
89a61d9374
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f
...
am: 815af2ba6e
2019-07-30 17:27:19 -07:00
Quang Luong
b66a8c86a4
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f
...
am: 5c4a0e3444
2019-07-30 17:26:35 -07:00
Quang Luong
5c4a0e3444
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
...
am: 17908b1e8f
2019-07-30 17:16:00 -07:00
Quang Luong
815af2ba6e
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
...
am: 17908b1e8f
2019-07-30 17:12:17 -07:00
TreeHugger Robot
17908b1e8f
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
2019-07-30 23:33:22 +00:00
Antony Sargent
2027cdd830
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev am: 66208e734b am: 9e58a8df39
...
am: 2640dd028e
2019-07-30 16:13:21 -07:00
Antony Sargent
74023e3057
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev am: 66208e734b am: 5a39d48ab2
...
am: 96c01305b2
2019-07-30 16:12:23 -07:00
Bill Yi
5f6bb63c21
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 67afe87617 -s ours am: c7b0ab4b49 -s ours
...
am: 45adb0424f
2019-07-30 16:11:30 -07:00
Bill Yi
79c4163833
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 67afe87617 -s ours am: 1b86d59384 -s ours
...
am: 2a3d4009df
2019-07-30 16:09:54 -07:00
Antony Sargent
2640dd028e
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev am: 66208e734b
...
am: 9e58a8df39
2019-07-30 15:59:27 -07:00
Antony Sargent
96c01305b2
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev am: 66208e734b
...
am: 5a39d48ab2
2019-07-30 15:58:36 -07:00
Antony Sargent
87929ae314
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev am: 66208e734b
...
am: 5a39d48ab2
2019-07-30 15:58:21 -07:00
Android Build Merger (Role)
45adb0424f
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 67afe87617 -s ours am: c7b0ab4b49 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
2019-07-30 22:57:55 +00:00
Bill Yi
57acbbb58e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 67afe87617 -s ours
...
am: c7b0ab4b49
2019-07-30 15:57:29 -07:00
Bill Yi
2a3d4009df
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 67afe87617 -s ours
...
am: 1b86d59384
2019-07-30 15:57:27 -07:00
Bill Yi
7543f194d4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 67afe87617 -s ours
...
am: 1b86d59384
2019-07-30 15:57:25 -07:00
Antony Sargent
5a39d48ab2
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev
...
am: 66208e734b
2019-07-30 15:43:32 -07:00
Antony Sargent
9e58a8df39
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev
...
am: 66208e734b
2019-07-30 15:43:32 -07:00
Bill Yi
c7b0ab4b49
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 67afe87617
2019-07-30 15:42:26 -07:00
Bill Yi
1b86d59384
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 67afe87617
2019-07-30 15:42:25 -07:00
TreeHugger Robot
66208e734b
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev
2019-07-30 22:33:32 +00:00
TreeHugger Robot
67afe87617
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-30 21:39:43 +00:00
TreeHugger Robot
1a409b97fe
Merge "Import translations. DO NOT MERGE"
2019-07-30 21:33:53 +00:00
Bill Yi
c2c7c9703c
[automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours am: f5c8056f7a -s ours am: f72e0eeddd -s ours
...
am: d8700db7c7
2019-07-30 12:43:55 -07:00
Antony Sargent
6d910e8608
Make EnabledNetworkModePreferenceController listen to setting changes
...
The controller for the "Preferred network type" preference on the SIM
details page wasn't listening for changes to the underlying global
setting, so changes to the setting would be reflected in SysUI but not
on this page if it happened to be showing.
Bug: 135667565
Test: make RunSettingsRoboTests
Change-Id: I5dfe4843a681c613f49caf4584e9dbebc54e708a
2019-07-30 12:30:19 -07:00
Bill Yi
d8700db7c7
[automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours am: f5c8056f7a -s ours
...
am: f72e0eeddd
2019-07-30 12:15:57 -07:00
Bill Yi
4c9c6c165e
[automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours am: f5c8056f7a -s ours am: 3cda841897 -s ours
...
am: d5352c93c8
2019-07-30 12:13:58 -07:00
