Bill Yi
0bfb16fc66
Merge pi-dr1-dev to aosp-master am: c1fe9e6ac2 am: 89e733ee2c
...
am: 58f707d162
2018-10-19 15:23:53 -07:00
Fan Zhang
948b4938fe
Fix sound settings affinity
...
Change-Id: Id92d7473f1d77ee5640a9da8f320777df496f635
Fixes: 117586503
Test: manual
2018-10-19 15:19:11 -07:00
Bill Yi
58f707d162
Merge pi-dr1-dev to aosp-master am: c1fe9e6ac2
...
am: 89e733ee2c
2018-10-19 15:17:08 -07:00
Bill Yi
89e733ee2c
Merge pi-dr1-dev to aosp-master
...
am: c1fe9e6ac2
2018-10-19 15:00:40 -07:00
jackqdyulei
ba7b3a8294
Refactor EuiccPreference
...
Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I7192e40c5ff6eb064f29517c21021a095d505d7f
2018-10-19 14:58:31 -07:00
Lei Yu
71a091901f
Merge changes I773aeabd,I6a9d7044
...
* changes:
Refactor DataServicePreference
Refactor 4gForLTE preference
2018-10-19 20:42:12 +00:00
Jason Chiu
0accca2cb6
Merge "Slice background worker with Wi-Fi Slice"
2018-10-19 20:23:05 +00:00
Bill Yi
c1fe9e6ac2
Merge pi-dr1-dev to aosp-master
...
Change-Id: I0cf933755a46ad6071cb085120a4b1b1c5d1976c
2018-10-19 12:20:48 -07:00
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
Fan Zhang
b91eb94c8a
Merge "Use public API to launch search UI."
2018-10-19 06:05:37 +00:00
Johnson Lu
7a5719ff5b
Add preference for WiFi MAC randomization.
...
Preference visibility contolled by feature flag -
settings_wifi_mac_randomization.
Bug: 1227787
Test: RunSettingsRoboTests
Change-Id: Ibad8d3ea2bfa3879acc1ec883b8c03f1979bde45
2018-10-19 11:54:25 +08: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
Fan Zhang
6b88c9c1b7
Use public API to launch search UI.
...
Test: manual
Change-Id: I5527dd6de5990aed365b6e78a9492ced00b99565
2018-10-18 16:26:59 -07:00
Hall Liu
78cc28d962
Merge "Start using CarrierConfig for 4G/LTE icon" am: 558535f3f2 am: e419904aa0
...
am: 322091c7eb
2018-10-18 15:54:56 -07:00
Hall Liu
322091c7eb
Merge "Start using CarrierConfig for 4G/LTE icon" am: 558535f3f2
...
am: e419904aa0
2018-10-18 15:31:05 -07:00
Hall Liu
e419904aa0
Merge "Start using CarrierConfig for 4G/LTE icon"
...
am: 558535f3f2
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
TreeHugger Robot
31a59e56d3
Merge "Give SliceView a height to support four rows and show more button."
2018-10-18 16:31:52 +00:00
Fan Zhang
f5e280e424
Merge "Added the EmergencyInfoSlice for ContextualHomepage"
2018-10-18 16:26:11 +00:00
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
2018-10-17 18:40:55 -07:00
Stanley Tng
0a6d538879
[automerger skipped] resolve merge conflicts of b0e99e1472 to stage-aosp-master
...
am: 81edd9a286
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
2018-10-16 23:29:32 -07:00
Bill Yi
8744027668
[automerger skipped] Import translations. DO NOT MERGE
...
am: f896493c70
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
