Commit Graph

49042 Commits

Author SHA1 Message Date
Lei Yu
d7a2569034 Merge "Refactor Cdma preference in ECM" 2018-10-23 23:53:29 +00:00
Fan Zhang
cc88c2fe43 Add place holder rows to wifi slice.
When loading wifi slice, the wifitracker is super slow to scan and
return APs. So we will show up to 3 rows of placeholder in the slice UI.

- When building slice, if there are at least 3 APs, show first 3.
- When there aren't enough APs, show them all and fill the rest of
  placeholder rows.

Bug: 118224581
Test: robotests
Change-Id: Id332f64bfa335543ea406f73b249f93504d63d4f
2018-10-23 15:48:14 -07:00
Hao Zhao
754930bc50 Fix toast is covered by PIN code screen after wrong pin
The error toast is displayed when user input wrong PIN
code three times, but at that moment the SIM PUK code input
page in SystemUI pop up and covers the toast, so the user
can't seen the error message.

Adjust the toast window layer, let the the toast pop up
over the SIM pin code input page.

Bug: 74056527
Change-Id: I569a2fc2adac15c4713b4c95e9720335bd4df88a
2018-10-24 06:39:45 +09:00
jackqdyulei
cdfa5bb378 Refactor Cdma preference in ECM
When phone is in ECM mode and Cdma preference is clicked, it should
first pop up ECM exit dialog. If user click yes, then it should launch
normal dialog.

This CL create a Cdma preference to stop launch normal dialog when in
ECM mode.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: Iba887d9fc49770b21cf0421ecc0120d63da43ef9
2018-10-23 14:38:32 -07:00
Fan Zhang
3accbd1e6d Remove calling to deprecated API.
Bug: 117860032
Test: robotests
Change-Id: I98b464b33c1f7f5aca6a002284247d36131c16e4
2018-10-23 13:33:04 -07:00
Doris Ling
03fb1a93ca DO NOT MERGE Fix summary text for advanced button.
- the resource for the summary text is in the support library. However,
the prebuilt version in the build does not contain the latest change for
the summary text. Add the overlay for the summary resource here with the
updated translation to remove the redundant summary prefix in the
advanced button.

Change-Id: I0fa8e3c9e02090d7d8a3e18608181ab73d2f46a1
Fixes: 118315852
Test: manual
2018-10-23 18:36:47 +00:00
Raff Tsai
db55661271 Change homepage layout
- merge PersonalSettingsFragment and TopLevelSettings together

Bug: 118224579
Test: manual
Change-Id: Ieee50a22babb25023e2a1767793e220862a38363
2018-10-23 19:37:19 +08:00
Johnson Lu
d7b9b3678d Merge "Adjust Wifi Privacy preference." 2018-10-23 03:20:39 +00:00
TreeHugger Robot
14ce5b21c2 Merge "Add DiffCallback to handle Contextual Cards update." 2018-10-23 00:46:53 +00:00
Emily Chuang
18a99faaf1 Add DiffCallback to handle Contextual Cards update.
Use DiffCallback in ContextualCardsAdapter to only update items that
are changed instead of touching those unchanged ones.

Also fix a bug where ConditionContexualCardCard#onStart is incorrectly
skipped.

Fixes: 112245748
Bug: 118165942
Test: robotests
Change-Id: I7989d621764fe40a3fceb8c9f40baced840818ba
2018-10-22 15:38:30 -07:00
jackqdyulei
3d7e38bc57 Refactor wifi calling and video calling
Also add a Callback for 4gLte to notify update to video calling
preference controller

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I0b5009733251162327f02ccfae8b10ae56b961bc
2018-10-22 13:02:32 -07:00
TreeHugger Robot
f3fb639f49 Merge "Use main looper for PhoneStateListener" 2018-10-22 19:57:35 +00:00
jackqdyulei
6ac8d80fcb Use main looper for PhoneStateListener
Also init all subIds to INVALID in constructor

Change-Id: Ic66a2e5a24dbc10d52db0069f0e863c96ec12513
Fixes: 118070636
Test: Manual
2018-10-22 10:25:38 -07:00
Johnson Lu
e936774fa3 Adjust Wifi Privacy preference.
Show Wifi MAC Randomization preference in both "Add network" and "Join
Network" flows.

Bug: 1227787
Test: RunSettingsRoboTests
Change-Id: Iff422eb870e661ceda5ae04f55de802a91f08aeb
2018-10-22 16:49:18 +08:00
TreeHugger Robot
0a546d1916 Merge "SliceLiveData should remove observers." 2018-10-22 03:29:42 +00:00
TreeHugger Robot
53df35e616 Merge "Refactor EuiccPreference" 2018-10-22 02:28:14 +00:00
Johnson Lu
deb0000d86 Merge "Add preference for WiFi MAC randomization." 2018-10-22 00:53:54 +00:00
TreeHugger Robot
387ceccf25 Merge "Fix sound settings affinity" 2018-10-20 00:56:22 +00:00
Bill Yi
0bfb16fc66 Merge pi-dr1-dev to aosp-master am: c1fe9e6ac2 am: 89e733ee2c
am: 58f707d162

Change-Id: I6799e0168f4f32adc78888426a5591a9b1bd7fc7
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

Change-Id: I0808d725397294f4a19add88b278472360f48b64
2018-10-19 15:17:08 -07:00
Bill Yi
89e733ee2c Merge pi-dr1-dev to aosp-master
am: c1fe9e6ac2

Change-Id: I6a6eafb34b31bc343dfe4117f17ccba771a7f111
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

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
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  -s ours

Change-Id: Iadd528089b68ff6622ce510132f9583b19f9152b
2018-10-17 18:40:55 -07:00