OSDN Git Service
Jason Chiu [Tue, 23 Oct 2018 07:31:54 +0000 (15:31 +0800)]
Fix crash on Wi-Fi Slice when it's continuously pinned and unpinned
It's because WifiTracker's initialization and onStop is on different
thread. Fine tune the thread logic in SliceBackgroundWorker.
Fixes:
118165942
Test: manual
Change-Id: Icc86b5df7ec3c6fd0e4a79a62ea0c84465e9528d
TreeHugger Robot [Thu, 25 Oct 2018 08:00:01 +0000 (08:00 +0000)]
Merge "[Settings] Use 1030 opcode, deprecate 1024."
TreeHugger Robot [Thu, 25 Oct 2018 05:59:24 +0000 (05:59 +0000)]
Merge "Revert "Add Support for Virtual High Refresh Rate mode""
Bill Yi [Thu, 25 Oct 2018 02:38:25 +0000 (19:38 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am:
8b16aba0dd -s ours am:
27e14db009 -s ours
am:
816e75fbc3 -s ours
Change-Id: I44155262f8685a56f4c678d9d2ca7d60e04707d4
Fan Zhang [Thu, 25 Oct 2018 02:26:15 +0000 (02:26 +0000)]
Merge "Repro b/
118398695"
Bill Yi [Thu, 25 Oct 2018 01:53:10 +0000 (18:53 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am:
8b16aba0dd -s ours
am:
27e14db009 -s ours
Change-Id: Ic2e8292d1f5936b943ba084611456fcf19651004
Peiyong Lin [Thu, 25 Oct 2018 01:23:01 +0000 (18:23 -0700)]
[Settings] Use 1030 opcode, deprecate 1024.
Previously we separated wide color gamut out of color management and added a
new opcode 1030 to query whether the device's built-in display is color
managed. This patch deprecated 1024 opcode.
BUG:
111505327
Test: Build, flash, boot and check Settings>Display>Color
Change-Id: Ifaf03d02d21c47b7b3be987ceaabb61fa4449c8c
Bill Yi [Wed, 24 Oct 2018 23:31:58 +0000 (16:31 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am:
8b16aba0dd -s ours
Change-Id: I6072677fc094b42e0a1356aa440151f829e100a0
Fan Zhang [Wed, 24 Oct 2018 22:46:21 +0000 (15:46 -0700)]
Repro b/
118398695
Bug:
118398695
Test: robotests
Change-Id: I09331e042368f849651dbb1273d802f4ca24a832
Bill Yi [Wed, 24 Oct 2018 21:47:27 +0000 (14:47 -0700)]
Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: Id291dd4e424711a8cb39927b9733214b92b81d78
TreeHugger Robot [Wed, 24 Oct 2018 21:26:50 +0000 (21:26 +0000)]
Merge "Add Battery slice in Contextual Settings Homepage"
David Sodman [Mon, 15 Oct 2018 20:43:22 +0000 (13:43 -0700)]
Revert "Add Support for Virtual High Refresh Rate mode"
This reverts commit
7915fda7eea56a8461be3025dc7a6f18cf26c15a
as this feature has been cancelled.
Test: None
Change-Id: I5ea9afcc3191576e84742ccf316b030b5c00e5c4
Fan Zhang [Wed, 24 Oct 2018 20:25:54 +0000 (20:25 +0000)]
Merge "Fix a bug where cards overlap when rotating the screen"
Bill Yi [Wed, 24 Oct 2018 18:03:50 +0000 (11:03 -0700)]
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am:
851a72f941 -s ours
am:
30984acbe3 -s ours
Change-Id: Ic94a1cba03952f0d720fc8a7d3892b88e0f3cf69
Bill Yi [Wed, 24 Oct 2018 17:45:20 +0000 (10:45 -0700)]
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am:
851a72f941 -s ours
Change-Id: I9eb1bf07cd24821c999cdb31a7d7f51ca7ffc85c
Bill Yi [Wed, 24 Oct 2018 16:07:12 +0000 (09:07 -0700)]
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
Change-Id: Ia33547dfec9adf4000d3ed2665f2c3804be97071
Mill Chen [Fri, 5 Oct 2018 14:11:45 +0000 (22:11 +0800)]
Add Battery slice in Contextual Settings Homepage
- Add Battery card that implements CustomSliceable in Contextual
Settings Homepage.
- Add test case for Battery slice.
- Created a loadBatteryInfo method for BatterySlice.
- Add a map in CustomSliceManager to cache CustomSliceable instances,
let existing battery slice be able to update battery info.
- Use a flag to avoid triggering an infinite loop when calling
notifyChange in the callback function.
Bug:
114796623,
115971399
Test: manual, robotests
Change-Id: I4b785708bf8456c6c4de7cae4b44f8a060bccbae
Emily Chuang [Wed, 24 Oct 2018 11:42:17 +0000 (19:42 +0800)]
Fix a bug where cards overlap when rotating the screen
Check if a certain fragment has been added before. If it's added, then
just show it instead of re-adding it again.
Bug:
118344247
Test: visual
Change-Id: I039a3a7372e163c6bcda386d2aea99e6f8c8e9b1
Fan Zhang [Wed, 24 Oct 2018 02:36:50 +0000 (19:36 -0700)]
Merge "Fix toast is covered by PIN code screen after wrong pin" am:
d5abc0eb44 am:
c150f5eb29
am:
4c95f60b9e
Change-Id: I651be252786c84156be901ef30f7cab37c1d4fdb
Fan Zhang [Wed, 24 Oct 2018 02:30:39 +0000 (19:30 -0700)]
Merge "Fix toast is covered by PIN code screen after wrong pin" am:
d5abc0eb44
am:
c150f5eb29
Change-Id: Ia4e59e195720919f2baa52e7d5667aed27c5ce7c
Fan Zhang [Wed, 24 Oct 2018 02:24:29 +0000 (19:24 -0700)]
Merge "Fix toast is covered by PIN code screen after wrong pin"
am:
d5abc0eb44
Change-Id: Ie2cfeeb5573ae6b79855edbd87210bfe0e0a8287
Fan Zhang [Wed, 24 Oct 2018 02:16:57 +0000 (02:16 +0000)]
Merge "Fix toast is covered by PIN code screen after wrong pin"
Fan Zhang [Wed, 24 Oct 2018 02:15:18 +0000 (02:15 +0000)]
Merge "Add place holder rows to wifi slice."
Lei Yu [Tue, 23 Oct 2018 23:53:29 +0000 (23:53 +0000)]
Merge "Refactor Cdma preference in ECM"
Fan Zhang [Tue, 23 Oct 2018 20:59:59 +0000 (13:59 -0700)]
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
Hao Zhao [Tue, 8 Aug 2017 07:21:49 +0000 (15:21 +0800)]
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
jackqdyulei [Mon, 22 Oct 2018 23:10:41 +0000 (16:10 -0700)]
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
Fan Zhang [Tue, 23 Oct 2018 20:33:04 +0000 (13:33 -0700)]
Remove calling to deprecated API.
Bug:
117860032
Test: robotests
Change-Id: I98b464b33c1f7f5aca6a002284247d36131c16e4
Raff Tsai [Sat, 20 Oct 2018 15:59:52 +0000 (23:59 +0800)]
Change homepage layout
- merge PersonalSettingsFragment and TopLevelSettings together
Bug:
118224579
Test: manual
Change-Id: Ieee50a22babb25023e2a1767793e220862a38363
Johnson Lu [Tue, 23 Oct 2018 03:20:39 +0000 (03:20 +0000)]
Merge "Adjust Wifi Privacy preference."
TreeHugger Robot [Tue, 23 Oct 2018 00:46:53 +0000 (00:46 +0000)]
Merge "Add DiffCallback to handle Contextual Cards update."
Emily Chuang [Tue, 16 Oct 2018 10:49:29 +0000 (18:49 +0800)]
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
jackqdyulei [Fri, 19 Oct 2018 18:25:15 +0000 (11:25 -0700)]
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
TreeHugger Robot [Mon, 22 Oct 2018 19:57:35 +0000 (19:57 +0000)]
Merge "Use main looper for PhoneStateListener"
jackqdyulei [Mon, 22 Oct 2018 17:22:00 +0000 (10:22 -0700)]
Use main looper for PhoneStateListener
Also init all subIds to INVALID in constructor
Change-Id: Ic66a2e5a24dbc10d52db0069f0e863c96ec12513
Fixes:
118070636
Test: Manual
Johnson Lu [Mon, 22 Oct 2018 08:23:54 +0000 (16:23 +0800)]
Adjust Wifi Privacy preference.
Show Wifi MAC Randomization preference in both "Add network" and "Join
Network" flows.
Bug:
1227787
Test: RunSettingsRoboTests
Change-Id: Iff422eb870e661ceda5ae04f55de802a91f08aeb
TreeHugger Robot [Mon, 22 Oct 2018 03:29:42 +0000 (03:29 +0000)]
Merge "SliceLiveData should remove observers."
TreeHugger Robot [Mon, 22 Oct 2018 02:28:14 +0000 (02:28 +0000)]
Merge "Refactor EuiccPreference"
Johnson Lu [Mon, 22 Oct 2018 00:53:54 +0000 (00:53 +0000)]
Merge "Add preference for WiFi MAC randomization."
TreeHugger Robot [Sat, 20 Oct 2018 00:56:22 +0000 (00:56 +0000)]
Merge "Fix sound settings affinity"
Bill Yi [Fri, 19 Oct 2018 22:23:53 +0000 (15:23 -0700)]
Merge pi-dr1-dev to aosp-master am:
c1fe9e6ac2 am:
89e733ee2c
am:
58f707d162
Change-Id: I6799e0168f4f32adc78888426a5591a9b1bd7fc7
Fan Zhang [Fri, 19 Oct 2018 22:19:11 +0000 (15:19 -0700)]
Fix sound settings affinity
Change-Id: Id92d7473f1d77ee5640a9da8f320777df496f635
Fixes:
117586503
Test: manual
Bill Yi [Fri, 19 Oct 2018 22:17:08 +0000 (15:17 -0700)]
Merge pi-dr1-dev to aosp-master am:
c1fe9e6ac2
am:
89e733ee2c
Change-Id: I0808d725397294f4a19add88b278472360f48b64
Bill Yi [Fri, 19 Oct 2018 22:00:40 +0000 (15:00 -0700)]
Merge pi-dr1-dev to aosp-master
am:
c1fe9e6ac2
Change-Id: I6a6eafb34b31bc343dfe4117f17ccba771a7f111
jackqdyulei [Thu, 18 Oct 2018 23:46:58 +0000 (16:46 -0700)]
Refactor EuiccPreference
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: I7192e40c5ff6eb064f29517c21021a095d505d7f
Lei Yu [Fri, 19 Oct 2018 20:42:12 +0000 (20:42 +0000)]
Merge changes I773aeabd,I6a9d7044
* changes:
Refactor DataServicePreference
Refactor 4gForLTE preference
Jason Chiu [Fri, 19 Oct 2018 20:23:05 +0000 (20:23 +0000)]
Merge "Slice background worker with Wi-Fi Slice"
Bill Yi [Fri, 19 Oct 2018 19:20:48 +0000 (12:20 -0700)]
Merge pi-dr1-dev to aosp-master
Change-Id: I0cf933755a46ad6071cb085120a4b1b1c5d1976c
jackqdyulei [Thu, 18 Oct 2018 21:48:48 +0000 (14:48 -0700)]
Refactor DataServicePreference
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: I773aeabdc1964436cc1e67bbbe9ad7fa6494e504
jackqdyulei [Thu, 18 Oct 2018 04:24:22 +0000 (21:24 -0700)]
Refactor 4gForLTE preference
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: I6a9d7044e16de2e70fadd97379b2a6de6d18525f
Fan Zhang [Fri, 19 Oct 2018 06:05:37 +0000 (06:05 +0000)]
Merge "Use public API to launch search UI."
Johnson Lu [Thu, 18 Oct 2018 07:33:14 +0000 (15:33 +0800)]
Add preference for WiFi MAC randomization.
Preference visibility contolled by feature flag -
settings_wifi_mac_randomization.
Bug:
1227787
Test: RunSettingsRoboTests
Change-Id: Ibad8d3ea2bfa3879acc1ec883b8c03f1979bde45
Lei Yu [Fri, 19 Oct 2018 02:00:03 +0000 (02:00 +0000)]
Merge "Refactor another network mode preference"
Lei Yu [Fri, 19 Oct 2018 01:59:33 +0000 (01:59 +0000)]
Merge "Update id for Toolbar"
Fan Zhang [Thu, 18 Oct 2018 23:23:47 +0000 (16:23 -0700)]
Use public API to launch search UI.
Test: manual
Change-Id: I5527dd6de5990aed365b6e78a9492ced00b99565
Hall Liu [Thu, 18 Oct 2018 22:54:56 +0000 (15:54 -0700)]
Merge "Start using CarrierConfig for 4G/LTE icon" am:
558535f3f2 am:
e419904aa0
am:
322091c7eb
Change-Id: I356e58af3dfe50a59ffc70b096ece86ece7c5d66
Hall Liu [Thu, 18 Oct 2018 22:31:05 +0000 (15:31 -0700)]
Merge "Start using CarrierConfig for 4G/LTE icon" am:
558535f3f2
am:
e419904aa0
Change-Id: I63428a32d201aa7260cc4aa96ad229e5bd83cf16
Hall Liu [Thu, 18 Oct 2018 21:56:56 +0000 (14:56 -0700)]
Merge "Start using CarrierConfig for 4G/LTE icon"
am:
558535f3f2
Change-Id: I9bb6a91c0c3a79f4b3fae4d50c431e0286b8c06f
jackqdyulei [Wed, 17 Oct 2018 19:54:05 +0000 (12:54 -0700)]
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
jackqdyulei [Thu, 18 Oct 2018 20:54:01 +0000 (13:54 -0700)]
Update id for Toolbar
If you use action_bar, it will show blank action bar.
Bug:
114749736
Test: Manual
Change-Id: I459eb00262e667446c88d7ff638b9a425a6eada2
Hall Liu [Thu, 18 Oct 2018 20:36:06 +0000 (20:36 +0000)]
Merge "Start using CarrierConfig for 4G/LTE icon"
TreeHugger Robot [Thu, 18 Oct 2018 16:31:52 +0000 (16:31 +0000)]
Merge "Give SliceView a height to support four rows and show more button."
Fan Zhang [Thu, 18 Oct 2018 16:26:11 +0000 (16:26 +0000)]
Merge "Added the EmergencyInfoSlice for ContextualHomepage"
Emily Chuang [Thu, 18 Oct 2018 13:01:25 +0000 (21:01 +0800)]
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
Jason Chiu [Mon, 8 Oct 2018 04:06:26 +0000 (12:06 +0800)]
Slice background worker with Wi-Fi Slice
Test: manual
Change-Id: Ic4fdc5713f511ff80f03728c99c68fda3d0cab02
Lei Yu [Thu, 18 Oct 2018 06:34:22 +0000 (06:34 +0000)]
Merge "Refactor PreferredNetworkModePreference"
Sunny Shao [Mon, 15 Oct 2018 11:41:10 +0000 (19:41 +0800)]
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
jackqdyulei [Tue, 16 Oct 2018 21:20:46 +0000 (14:20 -0700)]
Refactor PreferredNetworkModePreference
Create preference controller for it.
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: I456b0b954f47a6fb4c03926049b0579fd6488969
TreeHugger Robot [Thu, 18 Oct 2018 03:52:28 +0000 (03:52 +0000)]
Merge "Updated misc in Contextual Settings Homepage"
TreeHugger Robot [Thu, 18 Oct 2018 03:22:32 +0000 (03:22 +0000)]
Merge "Fix nav-up button in main settings activity."
Mill Chen [Wed, 17 Oct 2018 14:46:54 +0000 (22:46 +0800)]
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
Stanley Tng [Thu, 18 Oct 2018 01:40:55 +0000 (18:40 -0700)]
[automerger skipped] resolve merge conflicts of
b0e99e147253df35932c8c7c15911d091a07dda1 to stage-aosp-master am:
81edd9a286 -s ours
am:
0a6d538879 -s ours
Change-Id: Iadd528089b68ff6622ce510132f9583b19f9152b
Stanley Tng [Thu, 18 Oct 2018 01:23:18 +0000 (18:23 -0700)]
[automerger skipped] resolve merge conflicts of
b0e99e147253df35932c8c7c15911d091a07dda1 to stage-aosp-master
am:
81edd9a286 -s ours
Change-Id: I5d08af8af8e4056f49d8006f454c347f64ef643c
Lei Yu [Thu, 18 Oct 2018 00:44:47 +0000 (00:44 +0000)]
Merge "Refactor roaming preference"
Fan Zhang [Wed, 17 Oct 2018 23:27:41 +0000 (16:27 -0700)]
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
TreeHugger Robot [Wed, 17 Oct 2018 20:38:14 +0000 (20:38 +0000)]
Merge "Fix visible problem on status bar"
TreeHugger Robot [Wed, 17 Oct 2018 20:20:08 +0000 (20:20 +0000)]
Merge "Update toolbar for mobile network settings"
jackqdyulei [Tue, 16 Oct 2018 00:31:16 +0000 (17:31 -0700)]
Refactor roaming preference
Use preferenceController instead
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: Idb0276ea0ed1738d93223e072338ba3c32498a9d
TreeHugger Robot [Wed, 17 Oct 2018 18:38:45 +0000 (18:38 +0000)]
Merge "Sync style of filter component in data usage"
Stanley Tng [Wed, 17 Oct 2018 18:07:29 +0000 (11:07 -0700)]
resolve merge conflicts of
b0e99e147253df35932c8c7c15911d091a07dda1 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ife619e714d451b6cb77bfaf50e3f45c969d37cb4
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
TreeHugger Robot [Wed, 17 Oct 2018 17:28:22 +0000 (17:28 +0000)]
Merge "Fix InstantiationException on fragment"
jackqdyulei [Thu, 11 Oct 2018 00:43:06 +0000 (17:43 -0700)]
Update toolbar for mobile network settings
Bug:
114749736
Test: Manual
Change-Id: I9b01df83215ca6974b096060fa8d6669307c96e1
Eran Messeri [Wed, 17 Oct 2018 16:59:57 +0000 (16:59 +0000)]
Merge "Private DNS: Extract host verification code"
tmfang [Tue, 16 Oct 2018 16:59:06 +0000 (00:59 +0800)]
Fix visible problem on status bar
Battery Icon is not displayed on "Vision settings" screen
Test: visual
Change-Id: I272302af5b6e7309318c04b891d20526f68c5b0d
Fixes:
117751096
Emily Chuang [Wed, 17 Oct 2018 12:50:20 +0000 (20:50 +0800)]
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
Raff Tsai [Wed, 17 Oct 2018 10:02:40 +0000 (10:02 +0000)]
Merge "Use the same layout style for contextual cards"
TreeHugger Robot [Wed, 17 Oct 2018 08:36:55 +0000 (08:36 +0000)]
Merge "Consider Private DNS user restriction"
Bill Yi [Wed, 17 Oct 2018 06:29:32 +0000 (23:29 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
f896493c70 -s ours
am:
8744027668 -s ours
Change-Id: Ic42f563ca5bf56c2b35a3a90c27fbaa2ed7c32b7
Bill Yi [Wed, 17 Oct 2018 06:24:58 +0000 (23:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
f896493c70 -s ours
Change-Id: I4d93781a7e2f2d20b1d0e25338af6e24f1b5a448
Treehugger Robot [Wed, 17 Oct 2018 04:48:36 +0000 (04:48 +0000)]
Merge "Fix Connect State message in Device details for Hearing Aids"
Bill Yi [Wed, 17 Oct 2018 04:28:11 +0000 (21:28 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
117801752
Change-Id: I43766c0d85af44370fa136fb4b54869ccfb9bdb4
Lei Yu [Wed, 17 Oct 2018 02:56:39 +0000 (02:56 +0000)]
Merge changes I7a0845c0,I45ecbc86,I3d0203b7,I7cfc27ff
* changes:
Refactor DataUsagePreference
Refactor carrier settings
Refactor CdmaApnPreference
Refactor CdmaSubscriptionListPreference
TreeHugger Robot [Wed, 17 Oct 2018 00:26:37 +0000 (00:26 +0000)]
Merge "Also all EXTRA_USER as input for ACTION_SHOW_ADMIN_SUPPORT_DETAILS"
jackqdyulei [Mon, 15 Oct 2018 20:35:24 +0000 (13:35 -0700)]
Refactor DataUsagePreference
Move the logic to PreferenceController
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: I7a0845c0cbc3f33e23257831d0d4ed97e7a5cc04
jackqdyulei [Fri, 12 Oct 2018 20:50:28 +0000 (13:50 -0700)]
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
jackqdyulei [Thu, 11 Oct 2018 23:54:14 +0000 (16:54 -0700)]
Refactor CdmaApnPreference
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: I3d0203b7b5fb732e2814fb741761af4371924e9a
jackqdyulei [Thu, 11 Oct 2018 22:01:23 +0000 (15:01 -0700)]
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
Fan Zhang [Tue, 16 Oct 2018 21:42:05 +0000 (21:42 +0000)]
Merge "Remove second_button from condition tile. It's never used."
tmfang [Thu, 11 Oct 2018 08:20:15 +0000 (16:20 +0800)]
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
Neil Fuller [Tue, 16 Oct 2018 20:41:32 +0000 (20:41 +0000)]
Merge "Remove dependency on libcore internal annotation"