Commit Graph

48318 Commits

Author SHA1 Message Date
Raff Tsai
cb6b34e893 Merge "Use the same layout style for contextual cards" 2018-10-17 10:02:40 +00:00
TreeHugger Robot
1e6455be09 Merge "Consider Private DNS user restriction" 2018-10-17 08:36:55 +00:00
Bill Yi
15db518fcf [automerger skipped] Import translations. DO NOT MERGE am: f896493c70 -s ours
am: 8744027668  -s ours

Change-Id: Ic42f563ca5bf56c2b35a3a90c27fbaa2ed7c32b7
2018-10-16 23:29:32 -07:00
Bill Yi
8744027668 [automerger skipped] Import translations. DO NOT MERGE
am: f896493c70  -s ours

Change-Id: I4d93781a7e2f2d20b1d0e25338af6e24f1b5a448
2018-10-16 23:24:58 -07:00
Treehugger Robot
b0e99e1472 Merge "Fix Connect State message in Device details for Hearing Aids" 2018-10-17 04:48:36 +00:00
Bill Yi
f896493c70 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 117801752
Change-Id: I43766c0d85af44370fa136fb4b54869ccfb9bdb4
2018-10-17 04:32:19 +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
Fan Zhang
9c072cd621 Merge "Remove second_button from condition tile. It's never used." 2018-10-16 21:42:05 +00: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
Neil Fuller
1bd1e69f3c Merge "Remove dependency on libcore internal annotation" 2018-10-16 20:41:32 +00: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
Fan Zhang
e3e7387105 Remove second_button from condition tile. It's never used.
Change-Id: I69e50d3b777d36731eee024a437facdab67e7ffa
Fixes: 117823082
Test: visual
2018-10-16 12:12:21 -07:00
Fan Zhang
cff03505bb Merge "Use DayNight theme in factory reset page" 2018-10-16 18:08:56 +00:00
Stanley Tng
b402a56fec [automerger skipped] resolve merge conflicts of a8af2d3664 to pi-dev-plus-aosp
am: 0cc7d9a2af  -s ours

Change-Id: I3e982eed82df2491208d560cf4671db308674299
2018-10-16 10:09:09 -07:00
Stanley Tng
0cc7d9a2af resolve merge conflicts of a8af2d3664 to pi-dev-plus-aosp
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie95fe77f761197dee450e86bc0f7edba8d514959
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
2018-10-16 15:31:00 +00: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
Raff Tsai
f7bb72c60c Use the same layout style for contextual cards
Test: manual
Change-Id: I41d86df5147290a17ef698f4f6a192081d1e0742
2018-10-16 21:47:58 +08:00
Raff Tsai
2493587202 Use DayNight theme in factory reset page
Change-Id: I3cc75a34aaec71c97d1dd83eaf40232de1fd4168
Fixes: 73738836
Test: Manual
2018-10-16 04:21:15 +00:00
TreeHugger Robot
56aca80681 Merge "Fix ActionDisabledByAdminDialogHelperTest" 2018-10-16 00:54:51 +00:00
Stanley Tng
a8af2d3664 resolve merge conflicts of 019a771d2d to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Bug: None

Change-Id: I2fc36f4ee9a600e7e9c5ce00708736a4d4548358
2018-10-15 17:30:02 -07:00
jackqdyulei
820e22d324 Add entitlement check for usb tethering
Before this CL, usb tethering in detail page doesn't have entitlement
check. This CL fix it by using the correct API

Also polish it by updating the UI before entitlement check to align
hotspot page. So in UI it will first check "usb tethering". If
entitlement check fail, it will revoke and go back to previous selection.

Bug: 115707279
Test: RunSettingsRoboTests
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389
Change-Id: I3d2ebad2879479a870bcdfe596bb88b83c424389
2018-10-15 16:58:21 -07:00
Bill Yi
f7a0266dcf [automerger skipped] Import translations. DO NOT MERGE am: 2a1a5cba81 -s ours
am: dce00f9ae2  -s ours

Change-Id: I95de88756d3a50478a74f2d55acb2e4260fd626d
2018-10-15 16:50:36 -07:00
Bill Yi
dce00f9ae2 [automerger skipped] Import translations. DO NOT MERGE
am: 2a1a5cba81  -s ours

Change-Id: I79a8495fa76bbcb9dcee9e66a48ff4c3875f454d
2018-10-15 16:27:31 -07:00
Doris Ling
87df629dbb Merge "Get app info with correct user id." 2018-10-15 23:23:23 +00:00
Treehugger Robot
019a771d2d Merge "Add Feature Flag for Hearing Aid Profile" 2018-10-15 23:10:41 +00:00
Stanley Tng
a6c927b51a Fix Connect State message in Device details for Hearing Aids
In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the connect state messages
for these two devices. Also added Robo tests for the changes.

Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.
Bug: 117074814
Bug: 116725094
Change-Id: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
2018-10-15 22:51:02 +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
Bill Yi
2a1a5cba81 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I44be933d470fa7dad8e60b4ecb3dc038ff74c702
2018-10-15 12:34:57 -07: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
Philip P. Moltmann
1d95218e49 Merge "Use renamed restricted icon size config-value" 2018-10-15 17:16:55 +00: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
TreeHugger Robot
a9edb644a6 Merge "Filter out the connected device in "Available devices" screen(1/2)" 2018-10-15 12:44:38 +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
Bill Yi
0831a838c4 [automerger skipped] Import translations. DO NOT MERGE am: ebb0bbe3f7 -s ours
am: 31398ce165  -s ours

Change-Id: Ib10a86be266ca60ed857134d4402ba33cb040c46
2018-10-15 03:53:37 -07:00
Bill Yi
31398ce165 [automerger skipped] Import translations. DO NOT MERGE
am: ebb0bbe3f7  -s ours

Change-Id: I0b288ed9e17d6598d7b20cc724ea88a42309d984
2018-10-15 03:42:41 -07:00
Bill Yi
ebb0bbe3f7 Import translations. DO NOT MERGE
Change-Id: Id3ba67104115b2148f36fb26a94957ee6ac4a89d
Auto-generated-cl: translation import
2018-10-15 01:55:17 -07: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
Stanley Tng
a4fc23140a Add Feature Flag for Hearing Aid Profile
Using the Settings App-Developer Options-Feature Flag, allow the user to
enable or disable the Hearing Aid Profile.

Bug: 116725094
Bug: 116044083
Test: Manual testing using Settings App
Change-Id: I16b51d7feabc914219c24731eb39a23bd1782571
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
(cherry picked from commit 068c2547f6)
2018-10-13 16:21:15 -07: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