Commit Graph

48239 Commits

Author SHA1 Message Date
Emily Chuang
8b680a988d SliceLiveData should remove observers.
As positions of items will be changed, new sliceViews will be created.
SliceLiveData has been set to observe a certain old sliceView. When the
page is re-launched, we cannot garantee we always get the same
sliceView, which means the sliceLiveData may be still observing a sliveView that
is no longer applicable. This will lead to broken slices.
Hence, we need to remove observers first then make it observes a new sliceView.

Bug: 117922624
Test: robotests, visual
Change-Id: I59368a6ce5fa84487c9a4788b970fdc074a0c2a9
2018-10-18 23:24:26 +08:00
Jason Chiu
f17233ba7d Slice background worker with Wi-Fi Slice
Test: manual

Change-Id: Ic4fdc5713f511ff80f03728c99c68fda3d0cab02
2018-10-18 18:00:11 +08: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
Stanley Tng
d06cb5803f [automerger skipped] resolve merge conflicts of b0e99e1472 to stage-aosp-master am: 81edd9a286 -s ours
am: 0a6d538879  -s ours

Change-Id: Iadd528089b68ff6622ce510132f9583b19f9152b
2018-10-17 18:40:55 -07:00
Stanley Tng
0a6d538879 [automerger skipped] resolve merge conflicts of b0e99e1472 to stage-aosp-master
am: 81edd9a286  -s ours

Change-Id: I5d08af8af8e4056f49d8006f454c347f64ef643c
2018-10-17 18:23:18 -07: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
cc607b5634 Merge "Fix visible problem on status bar" 2018-10-17 20:38:14 +00: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
tmfang
60d0b3ce3b Fix visible problem on status bar
Battery Icon is not displayed on "Vision settings" screen

Test: visual
Change-Id: I272302af5b6e7309318c04b891d20526f68c5b0d
Fixes: 117751096
2018-10-18 00:52:08 +08:00
Emily Chuang
8d9b265620 Give SliceView a height to support four rows and show more button.
The default height of sliceView with MODE_LARGE is 240dp which supports
three rows(including the header) above "show more" button. Since WIFI
and Connected devices use cases require four rows + show more button, we
need to expand the height to fulfill it.

Bug: 117868297
Test: visual
Change-Id: I13b29c3f859d1c117c680432f9a6ad8e71c6acf5
2018-10-17 20:50:20 +08:00
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
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