Commit Graph

23920 Commits

Author SHA1 Message Date
TreeHugger Robot
deaded12c7 Merge "Sync style of filter component in data usage" 2018-10-17 18:38:45 +00:00
TreeHugger Robot
f02115f6e1 Merge "Fix InstantiationException on fragment" 2018-10-17 17:28:22 +00:00
Eran Messeri
54fca28215 Merge "Private DNS: Extract host verification code" 2018-10-17 16:59:57 +00:00
TreeHugger Robot
1e6455be09 Merge "Consider Private DNS user restriction" 2018-10-17 08:36:55 +00:00
Lei Yu
5181493586 Merge changes I7a0845c0,I45ecbc86,I3d0203b7,I7cfc27ff
* changes:
  Refactor DataUsagePreference
  Refactor carrier settings
  Refactor CdmaApnPreference
  Refactor CdmaSubscriptionListPreference
2018-10-17 02:56:39 +00:00
TreeHugger Robot
c496feec04 Merge "Also all EXTRA_USER as input for ACTION_SHOW_ADMIN_SUPPORT_DETAILS" 2018-10-17 00:26:37 +00:00
jackqdyulei
5680477b8b Refactor DataUsagePreference
Move the logic to PreferenceController

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I7a0845c0cbc3f33e23257831d0d4ed97e7a5cc04
2018-10-16 15:40:17 -07:00
jackqdyulei
1d133e3f04 Refactor carrier settings
Only show it when:
1. It is in CDMA or GSM mode
2. CarrierConfig tell settings to show it

Bug: 114749736
Test: RunSettingsRoboTests

Change-Id: I45ecbc86c793ebec602142be208058e2043a2ba7
2018-10-16 15:33:20 -07:00
jackqdyulei
2de3d28138 Refactor CdmaApnPreference
Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I3d0203b7b5fb732e2814fb741761af4371924e9a
2018-10-16 15:33:20 -07:00
jackqdyulei
37f2e60b8c Refactor CdmaSubscriptionListPreference
Extract CdmaBasePreferenceController that can be shared by all CDMA
PreferenceController. Also create new subscription controller to use
it.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I7cfc27ffd0704d09dc02e49fbf5641ff8b90642d
2018-10-16 15:33:20 -07:00
tmfang
6e16b69887 Sync style of filter component in data usage
Settings have new filter component with settings style.
This CL replaced Spinner to SettingsSpinner in data usage page.

Change-Id: I212b6b6ed203f8bffd094c0180873060b93c39cb
Fixes: 117568930
Test: robotests, visual
2018-10-17 05:14:46 +08:00
tmfang
d5405cf49d Fix InstantiationException on fragment
Since we overrided the empty constructor,
it can't find a empty constructor when
Fragment tries to instantiate a fragment
in framework.

So, we can't override this constructor,
and then just use newInstance() to initialize
and setup a new Fragment.

Test: robotest
Change-Id: Ifcd1c1771bc69d947caeee5c5bc055c4f94365c2
Fixes: 115676209
2018-10-17 04:20:09 +08:00
Neil Fuller
cf61df33b0 Remove dependency on libcore internal annotation
Remove dependency on libcore internal annotation -
the standard Android one should do.

Bug: 113148576
Test: build only
Change-Id: I067679b042d0698a4cc4afddc469dbcf68fce143
2018-10-16 15:51:21 +01:00
TreeHugger Robot
56aca80681 Merge "Fix ActionDisabledByAdminDialogHelperTest" 2018-10-16 00:54:51 +00:00
Doris Ling
87df629dbb Merge "Get app info with correct user id." 2018-10-15 23:23:23 +00:00
Philip P. Moltmann
098d3a79fd Fix ActionDisabledByAdminDialogHelperTest
- Revert user handling in setAdminSupportDetails to before my changes.
- Implement getUserProfiles in Settings-shadows as the the
  Settings-shadows do not forwarded to profiles the robolectric-default
  shadows

Test: make RunSettingsRoboTests
Change-Id: Idfd4722fe55a17c57d336db943904eb1aeb6e7ce
2018-10-15 14:30:34 -07:00
Eran Messeri
717194c87c Consider Private DNS user restriction
As a new user restriction, to disallow changing Private DNS settings, was
added, make the Private DNS mode dialog preference consider whether to
let the user modify it or not based on the presence of this restriction.

Bug: 112982691
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testPrivateDnsPolicy
Test: m -j RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Test: Manual, using TestDPC

Change-Id: If815860ace3aadf6f79fd23173f0a2c80a29f0e1
2018-10-15 21:34:47 +01:00
TreeHugger Robot
0d0eec6d4e Merge "Refactor CdmaSystemSelectListPreference" 2018-10-15 20:08:31 +00:00
Youming Ye
792e6afc84 Merge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a am: 8bac59265e
am: 6293483fce

Change-Id: I5b533e911f1185bb9fe1847701e333093b49926e
2018-10-15 11:41:46 -07:00
Youming Ye
6293483fce Merge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a
am: 8bac59265e

Change-Id: If28ef5f32183918404896ed395a49c9c2d87067a
2018-10-15 10:59:04 -07:00
Youming Ye
8bac59265e Merge "Fix error message shown when SIM PIN enable/disable fails"
am: f29392303a

Change-Id: I060d7e0e02b56d9fea5260ba1f2cf8a1ea746414
2018-10-15 10:42:52 -07:00
Youming Ye
f29392303a Merge "Fix error message shown when SIM PIN enable/disable fails" 2018-10-15 17:08:22 +00:00
Philip P. Moltmann
b9a83d584d Merge "Use SYSTEM_... window manager flags" 2018-10-15 16:28:39 +00:00
Eran Messeri
7ba739ba14 Private DNS: Extract host verification code
Since Private DNS host may now be set by the admin via the
DevicePolicyManager, extract the verification code to the
ConnectivityManager so it can be used both from Settings and framework
code.

Bug: 112982691
Test: See cts tests.
Change-Id: Ic091e4714f8d3f9f28042bc825cf57c991504f27
2018-10-15 11:53:38 +01:00
Ash_Chen
42f3dfe672 Filter out the connected device in "Available devices" screen(1/2)
Don't add connected devices under "Available devices"

Bug: 113568981
Test: Bluetooth Pairing Test with some devices and accessories
Change-Id: I2cce35cd5c237ea90cf1c128e951816474c7a658
2018-10-15 10:54:46 +08:00
Brad Ebinger
d69be7df8d Merge "RadioInfo: Disable ims provisioning switches in USER-build" am: 61c5a296e6 am: 59eb9e9d90
am: be94f07e8d

Change-Id: I7c7277c9108afda3809415bc174baa7939fedac8
2018-10-12 16:13:58 -07:00
Brad Ebinger
be94f07e8d Merge "RadioInfo: Disable ims provisioning switches in USER-build" am: 61c5a296e6
am: 59eb9e9d90

Change-Id: Ia0f24f55c529b166cfcd2bba4ca7af85d2e70759
2018-10-12 16:07:09 -07:00
Brad Ebinger
59eb9e9d90 Merge "RadioInfo: Disable ims provisioning switches in USER-build"
am: 61c5a296e6

Change-Id: I3211ffb7e25af0e60ac20175bf86466ee4c85998
2018-10-12 16:03:02 -07:00
Brad Ebinger
61c5a296e6 Merge "RadioInfo: Disable ims provisioning switches in USER-build" 2018-10-12 22:46:21 +00:00
Takamasa Kuramitsu
ec01e260fb Merge "Move content later button doesn't work on Migration Wizard" am: 1308b56908 am: d77dfa200e
am: 7cb8223ce2

Change-Id: I18c7e985c8a1f5e3f4cbc0cdeb980aee9464218d
2018-10-12 14:21:52 -07:00
Takamasa Kuramitsu
7cb8223ce2 Merge "Move content later button doesn't work on Migration Wizard" am: 1308b56908
am: d77dfa200e

Change-Id: I88e0b556594e5bdadf3c12d0c1fd0483f928261a
2018-10-12 14:14:33 -07:00
Takamasa Kuramitsu
d77dfa200e Merge "Move content later button doesn't work on Migration Wizard"
am: 1308b56908

Change-Id: I210eb94a69ce434c5b838dedbf90a937e92e71e9
2018-10-12 14:07:25 -07:00
Treehugger Robot
1308b56908 Merge "Move content later button doesn't work on Migration Wizard" 2018-10-12 20:52:31 +00:00
jackqdyulei
b820483fad Refactor CdmaSystemSelectListPreference
Most logic is copied from previous ListPreference however
1. Create PreferenceController for it
2. Extract API to check whether to display CMDA options
3. In controller, provide API to force display dialog

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: Ic40d2ac1dc1854df9c90d912ea9fc822531b413d
2018-10-12 10:11:58 -07:00
TreeHugger Robot
ddd70cdbf6 Merge "Disable sliceView scrolling in the homepage." 2018-10-12 05:05:03 +00:00
TreeHugger Robot
a687b5d28d Merge "Proceed to "finish" page upon completing enrollment" 2018-10-12 03:56:26 +00:00
Emily Chuang
e7a6d1ca1e Disable sliceView scrolling in the homepage.
Set isScrollable() to false so as to have the "see more" option.

Fixes: 117626982
Test: robotest
Change-Id: Ie0b8a207fb0c1eff41a98cc897e5f8cf29ccce0a
2018-10-12 10:16:51 +08:00
Kevin Chyn
b0d9b8403a Proceed to "finish" page upon completing enrollment
Bug: 111548037

Test: manual
Change-Id: I1c0c5cc0eb2d1808221465c5eeba92e59b2cd572
2018-10-11 18:26:37 -07:00
Doris Ling
b9ff5892ca Get app info with correct user id.
- when querying app info from package manager, we should use the methods
that takes the user id so that it will work properly with managed
profile.

Change-Id: Ifc84d3a29aaf7b2c1acfa096596a53f1715cc908
Fixes: 117222623
Test: make RunSettingsRoboTests
2018-10-11 16:47:03 -07:00
Lei Yu
6773c7efcb Merge "Change packagename to telephony" 2018-10-11 22:32:31 +00:00
TreeHugger Robot
bf7d0eb156 Merge "Fix crash on KeyboardLayoutDialogFragment" 2018-10-11 20:31:44 +00:00
jackqdyulei
8eec6ff917 Change packagename to telephony
Also move it under package network, so all of them belong to
com.android.settings.network.telephony.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I35dbdcd5cc9dab939b0a3efccc8897b9a92338d1
2018-10-11 11:46:38 -07:00
tmfang
a75eea1b01 Fix crash on KeyboardLayoutDialogFragment
Since view id changed after fragment migration,
we correct view id.

Change-Id: If81ca06423ac62fd9f6a118be0b5fe3c93356142
Fixes: 117559309
Test: robotest
2018-10-12 01:27:46 +08:00
TreeHugger Robot
94017b543f Merge "Fix problem on filter widget in memory page" 2018-10-11 16:46:17 +00:00
tmfang
0d2faf31c1 Fix problem on filter widget in memory page
We need to use SettingsSpinnerAdapater
with settings style item.

Test: visual
Bug: 117568930
Change-Id: Ia60b7d08c11a270e029e6b673a12d838f454eccf
Fixes: 117541499
2018-10-11 13:41:53 +08:00
Lei Yu
695638ce35 Merge "Copy wifiCalling method from telephony to settings" 2018-10-11 04:11:07 +00:00
TreeHugger Robot
45d8fbe54f Merge "Change search fab to search bar." 2018-10-11 02:42:24 +00:00
Lei Yu
62dc9bb747 Merge "Add network listener in MobileSettingsActivity" 2018-10-11 01:14:09 +00:00
Lei Yu
7c570c8bae Merge "Add target fragment for RoamingDialogFragment" 2018-10-11 00:25:18 +00:00
Lei Yu
9b373eb7a0 Merge "Refactor MobileDataPreference" 2018-10-11 00:24:56 +00:00