Commit Graph

23950 Commits

Author SHA1 Message Date
jackqdyulei
fd44f76bf7 Refactor DataServicePreference
Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I773aeabdc1964436cc1e67bbbe9ad7fa6494e504
2018-10-19 09:58:51 -07:00
jackqdyulei
502f3c6c91 Refactor 4gForLTE preference
Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I6a9d7044e16de2e70fadd97379b2a6de6d18525f
2018-10-19 09:57:54 -07:00
Lei Yu
c294ce437e Merge "Refactor another network mode preference" 2018-10-19 02:00:03 +00:00
Lei Yu
0ff2f2d4d2 Merge "Update id for Toolbar" 2018-10-19 01:59:33 +00:00
Hall Liu
78cc28d962 Merge "Start using CarrierConfig for 4G/LTE icon" am: 558535f3f2 am: e419904aa0
am: 322091c7eb

Change-Id: I356e58af3dfe50a59ffc70b096ece86ece7c5d66
2018-10-18 15:54:56 -07:00
Hall Liu
322091c7eb Merge "Start using CarrierConfig for 4G/LTE icon" am: 558535f3f2
am: e419904aa0

Change-Id: I63428a32d201aa7260cc4aa96ad229e5bd83cf16
2018-10-18 15:31:05 -07:00
Hall Liu
e419904aa0 Merge "Start using CarrierConfig for 4G/LTE icon"
am: 558535f3f2

Change-Id: I9bb6a91c0c3a79f4b3fae4d50c431e0286b8c06f
2018-10-18 14:56:56 -07:00
jackqdyulei
9132ab5533 Refactor another network mode preference
This preference show up if phone is not in world mode and offer some
simplified choices.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I9204466be630f122fb02773d18a947706999ab79
2018-10-18 13:58:03 -07:00
jackqdyulei
1fccc048f5 Update id for Toolbar
If you use action_bar, it will show blank action bar.

Bug: 114749736
Test: Manual
Change-Id: I459eb00262e667446c88d7ff638b9a425a6eada2
2018-10-18 13:54:01 -07:00
Hall Liu
558535f3f2 Merge "Start using CarrierConfig for 4G/LTE icon" 2018-10-18 20:36:06 +00:00
Fan Zhang
f5e280e424 Merge "Added the EmergencyInfoSlice for ContextualHomepage" 2018-10-18 16:26:11 +00:00
Lei Yu
4ae062b7c8 Merge "Refactor PreferredNetworkModePreference" 2018-10-18 06:34:22 +00:00
Sunny Shao
0057c4127c Added the EmergencyInfoSlice for ContextualHomepage
- Generated a simple EmergencyInfo slice with fixed string in title and summary.
- Moved hardcode string into strings.xml
- Modified the contentProviderCall_returnCorrectSize test case for general version

Bug: 114793520
Test: compile and manual test
Change-Id: Ia3444c61b0f7e4c04794fe3590dc0731885cf062
2018-10-18 14:10:13 +08:00
jackqdyulei
e8a56c183a Refactor PreferredNetworkModePreference
Create preference controller for it.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I456b0b954f47a6fb4c03926049b0579fd6488969
2018-10-17 21:26:30 -07:00
TreeHugger Robot
89d44bff44 Merge "Updated misc in Contextual Settings Homepage" 2018-10-18 03:52:28 +00:00
TreeHugger Robot
326a4cd219 Merge "Fix nav-up button in main settings activity." 2018-10-18 03:22:32 +00:00
Mill Chen
77b2a30e9d Updated misc in Contextual Settings Homepage
- Set static cards with full width and removed packageName from setName
method.
- Removed Storage card from createStaticCards method because it does not
belong to default category.
- Changed the parameter type of setSliceUri from String to Uri in ContextualCard.
- Added StorageSlice and DeviceInfoSlice to the contextual card
provider.
- Fixed test cases related to these changes.

bug: 117874766
Test: robotest
Change-Id: Ic2dca353f85d0b6191ab19882dd8c5cb9c6cc658
2018-10-18 10:43:23 +08:00
Lei Yu
5b0c051dcd Merge "Refactor roaming preference" 2018-10-18 00:44:47 +00:00
Fan Zhang
615f18e987 Fix nav-up button in main settings activity.
It should be a non-clickable search icon, not back button. Apparently
the init code must be executed after setActionBar.

Change-Id: Ibbc8aefeebc44562c6105cb51e6f6447a9705ff9
Fixes: 117797520
Test: manual
2018-10-17 16:27:41 -07:00
TreeHugger Robot
5477ffe081 Merge "Update toolbar for mobile network settings" 2018-10-17 20:20:08 +00:00
jackqdyulei
d622e14d85 Refactor roaming preference
Use preferenceController instead

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: Idb0276ea0ed1738d93223e072338ba3c32498a9d
2018-10-17 13:03:26 -07:00
TreeHugger Robot
deaded12c7 Merge "Sync style of filter component in data usage" 2018-10-17 18:38:45 +00:00
Stanley Tng
81edd9a286 resolve merge conflicts of b0e99e1472 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ife619e714d451b6cb77bfaf50e3f45c969d37cb4
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
2018-10-17 18:14:27 +00:00
TreeHugger Robot
f02115f6e1 Merge "Fix InstantiationException on fragment" 2018-10-17 17:28:22 +00:00
jackqdyulei
52b08e42ba Update toolbar for mobile network settings
Bug: 114749736
Test: Manual
Change-Id: I9b01df83215ca6974b096060fa8d6669307c96e1
2018-10-17 10:02:46 -07: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
Treehugger Robot
b0e99e1472 Merge "Fix Connect State message in Device details for Hearing Aids" 2018-10-17 04:48:36 +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
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
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
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
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