Commit Graph

19512 Commits

Author SHA1 Message Date
Christine Franks
bfb671391d resolve merge conflicts of 92f7794d90 to master
Test: I solemnly swer I tested this conflict resolution.
Change-Id: I2cbcd06b906904365f9257742ab1c51b67adc3af
2017-09-19 18:24:33 -07:00
Christine Franks
92f7794d90 Merge "Handle night display state when timezone changes" into oc-mr1-dev
am: cb52e803bf

Change-Id: I16968b7e1572cb91afc2345a16437194b243a955
2017-09-20 00:43:25 +00:00
Christine Franks
cb52e803bf Merge "Handle night display state when timezone changes" into oc-mr1-dev 2017-09-20 00:23:29 +00:00
TreeHugger Robot
530de5be78 Merge "Load suggestions through SettingsIntelligence." 2017-09-19 23:36:38 +00:00
Doris Ling
f2b60f9c17 Merge "Add log to help debug crash." 2017-09-19 22:51:04 +00:00
Ajay Nadathur
eedc449654 Merge "Deferred setup banner updates intermittently" into oc-mr1-dev am: dc66f96dda
am: b4b657179f

Change-Id: I86c4f0b77dd9be9926e92dd5c2cd57cce5c3e3d4
2017-09-19 22:36:09 +00:00
Ajay Nadathur
b4b657179f Merge "Deferred setup banner updates intermittently" into oc-mr1-dev
am: dc66f96dda

Change-Id: I7ca36b1a5712b2ed3ec890bab376b9cc63dd1c8b
2017-09-19 22:26:18 +00:00
TreeHugger Robot
dc66f96dda Merge "Deferred setup banner updates intermittently" into oc-mr1-dev 2017-09-19 22:13:30 +00:00
Sundeep Ghuman
00685675c8 Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev am: 77aeb2a0a7
am: ea98db9946

Change-Id: I5b125c60c4cc39b8f8661b2eff6d19de0c1c5eff
2017-09-19 21:22:08 +00:00
Sundeep Ghuman
ea98db9946 Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev
am: 77aeb2a0a7

Change-Id: I86e514f4a8d9546e4d2e60bc7967ba8bdf4e0a8c
2017-09-19 21:14:05 +00:00
TreeHugger Robot
77aeb2a0a7 Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev 2017-09-19 20:56:34 +00:00
Doris Ling
3afe3b0cbf Add log to help debug crash.
Bug: 65745404
Test: make RunSettingsRoboTests
Change-Id: Ia0d1de57ed33a08a54294e4b9895464e219cbc90
2017-09-19 13:50:31 -07:00
jeffreyhuang
52f4ed8204 Add comments to avoid merge conflicts
- These comments will be changed to controllers.add(...)
 - avoid merge conflicts when adding controller
 buildPreferenceControllers()

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I43f6b9ac41291f67626ba5d6f3ab3917c9c5e784
2017-09-19 13:21:25 -07:00
jeffreyhuang
223484ea3c Introduce OemUnlockPreferenceController
- Create new OemUnlockPreferenceController
 - Add new onActivityResult method in DeveloperOptionsController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I0b1387b9547e7c9f2a1a0963421d0ebea55d9ff4
2017-09-19 13:21:25 -07:00
Fan Zhang
82cb5a5cc8 Load suggestions through SettingsIntelligence.
- Add flag to switch between old/new implementation
- Add SuggestionLoader to load using Loader (instead of AsyncTask)
- Update DashboardAdapater/SuggestionAdapter to take List<Suggestion>
- Marked old getter/setters as @Deprecated and added comment
- Update tests to cover suggestionV2 adapter changes.

TODO:
- Handler for dismissing suggestion not set up yet.
- Suggestion data structure is incomplete (missing icon, remote view, etc)
- Need to extend Suggestion data strcture to support icon and
  remote view binding

Bug: 65065268
Test: robotests
Change-Id: I2378ef4c9edee972d5de93c3868068e2cde23f56
2017-09-19 11:56:54 -07:00
Ajay Nadathur
a7ca53bc41 Deferred setup banner updates intermittently
bug: 65641145
Test: Manually tested
Change-Id: I8661006ac1560dc1b6ce6f17205983003a231125
2017-09-19 18:50:25 +00:00
Salvador Martinez
f966d09b73 Merge "remove old anomaly code" 2017-09-19 18:11:11 +00:00
Christine Franks
c6c299bdbb Handle night display state when timezone changes
Bug: 64458884
Test: make RunSettingsRoboTests -j100

Change-Id: I1f0c073b796aa6826c236757e19c6ff6d5cb7602
2017-09-19 10:54:13 -07:00
Fan Zhang
c8bff87a9f Turn off WifiTetherSettings page.
Merged-In: If92798ddf075801e66cd97ecacff2f8df1e41985
Change-Id: Idab770509a8049907a256cce2b8f00f236c2dbdc
Fixes: 65852564
Test: rerun robotests
Test: new instrumentation test to check flag initial state
2017-09-19 10:16:38 -07:00
TreeHugger Robot
4314866a22 Merge "Update strings for pattern screens" 2017-09-19 03:57:59 +00:00
Doris Ling
c879239238 Add metadata handling for specifying tile order.
- if tile order is set in the metadata, it will be used as preference
order instead of the intent priority specified.

Change-Id: If1a09219ece7bb71fc476aad60dc66d7653dfd28
Fixes: 65172575
Test: make RunSettingsRoboTests
2017-09-18 16:19:05 -07:00
TreeHugger Robot
211ea46815 Merge "Refresh Wifi AP Config display when config changes" 2017-09-18 22:19:56 +00:00
Fan Zhang
5a8b70d3da Refresh Wifi AP Config display when config changes
Change-Id: I6fe284355223cbcedd82f95d6415c4d6b660f39f
Fixes: 64757839
Test: robotests
Test: rerun ACTS WifiTetheringTest:test_change_wifi_hotspot_ssid_when_hotspot_enabled
2017-09-18 13:42:36 -07:00
TreeHugger Robot
c0f1c8f216 Merge "Don't init batterystats in onCreate()" 2017-09-18 19:32:03 +00:00
TreeHugger Robot
0d019909a0 Merge "Introduce BluetoothSnoopLogPreferenceController" 2017-09-16 23:53:49 +00:00
TreeHugger Robot
2dec861b99 Merge "Introduce DeveloperOptionsPreferenceController" 2017-09-16 23:44:36 +00:00
TreeHugger Robot
6a48c518c3 Merge "Move SuggestionService AIDL related calls to a controller." 2017-09-16 02:41:27 +00:00
Fan Zhang
7c60efb930 Merge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev am: a42e9351c5
am: 3f070569a6

Change-Id: I7bf58afdb746d70b2a2728875b83d0f0c547d51e
2017-09-16 00:40:43 +00:00
Fan Zhang
3f070569a6 Merge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev
am: a42e9351c5

Change-Id: I21dc2b1866a7f9b0bef5eae84887780a985e1884
2017-09-16 00:38:15 +00:00
TreeHugger Robot
a42e9351c5 Merge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev 2017-09-16 00:33:33 +00:00
Fan Zhang
ffd531f1d3 Move SuggestionService AIDL related calls to a controller.
The controller makes it easier to manage IPCs and make it easier for
testing.

Bug: 65065268
Test: robotests
Change-Id: Ie5797655543cb22d8196267058598a1b4222a8d1
2017-09-15 17:32:49 -07:00
jeffreyhuang
9679fde0bc Introduce BluetoothSnoopLogPreferenceController
- Create new BluetoothSnoopLogPreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I1122ab1406abef429e499576c9d7bd3e9f8e537a
2017-09-15 15:27:26 -07:00
jeffreyhuang
4bfa56a7fd Introduce DeveloperOptionsPreferenceController
- New abstract class for all preference controllers in developer
 options
 - Used to handle changes in the master switch
 - DeveloperSettingsDashboardFragment has a reference to all preference
 controllers to call "handleMasterSwitchToggled()"

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I64c18f54e22551f025029336880e92ac3a0d4a8c
2017-09-15 15:27:26 -07:00
Fan Zhang
135fecbee3 Use "mid" stable id for condition cards conditionally.
When there is no suggestion, use "mid" stableId instead of "top"
stableId for the header card.

This avoid an animation jank: when user swipes away a suggestion, the
condition summary header moves up instead of disappears then reappears.

Old behavior:

---  Suggestion ---   --swipe-->     /// Top Header ///
///  Mid Header ///

New behavior:

--- Suggestion ---   -- swipe -->   /// Mid Header ///
/// Mid Header ///

(Notice the header id change)

Change-Id: I63512d3d21382488e43dddb8819fabe4af40d101
Fixes: 65729560
Test: robotests
2017-09-15 14:56:27 -07:00
Lei Yu
9bcf9723e5 Merge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev am: c872c14785
am: 3a01adad6d

Change-Id: I4669be435441db3e94bd06afafeaf693c3fa614e
2017-09-15 21:46:59 +00:00
Lei Yu
3a01adad6d Merge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev
am: c872c14785

Change-Id: I0f56d26a42ef107be632d360e944975db8e73b1d
2017-09-15 21:45:00 +00:00
TreeHugger Robot
c872c14785 Merge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev 2017-09-15 21:40:04 +00:00
Doris Ling
36ed425ab2 Merge "Add a new feature flag for the expand button in support lib." 2017-09-15 21:38:31 +00:00
Doris Ling
6f60cddc9e Add a new feature flag for the expand button in support lib.
- check the feature flag to determine whether to use the existing
progressive disclosure mixin or use the expand button in the support
library.
- add corresponding preference xml files that add the new preference
group attribute to use with the expand button in the support lib.

Bug: 63985174
Test: make RunSettingsRoboTests
Change-Id: Ida6eb6182a8066ad1413b7f6142512345fd914d0
2017-09-15 11:56:31 -07:00
Lei Yu
eb6db6cc4d Revert "Turn on wakeupAlarm anomaly detector"
This reverts commit 1a49a8ab39.

Bug: 65738439
Test: RunSettingsRoboTests

Change-Id: Ifb2f72ba51e229b9387ff5a977bd51b229fcdf6a
2017-09-15 18:03:56 +00:00
TreeHugger Robot
4169ac2fed Merge "Simplify IndexData builder" 2017-09-15 18:01:46 +00:00
Antony Sargent
b3576c9fa6 Merge "Bring back "Turning on hotspot" status text when starting hotspot" into oc-mr1-dev am: b991dcd1b8
am: a99dea8e66

Change-Id: Ie52a604be9901600b4d94eed77cfa43c1761fbd8
2017-09-15 17:44:11 +00:00
Antony Sargent
a99dea8e66 Merge "Bring back "Turning on hotspot" status text when starting hotspot" into oc-mr1-dev
am: b991dcd1b8

Change-Id: I738bde4deee58ab84f24302048534f657698603b
2017-09-15 17:42:26 +00:00
Antony Sargent
b991dcd1b8 Merge "Bring back "Turning on hotspot" status text when starting hotspot" into oc-mr1-dev 2017-09-15 17:32:07 +00:00
Doris Ling
3a8c22c231 Merge "Default apps settings disappear when switching to secondary user" am: 939265d6ea am: 0533f9ff4a am: 18c3bde1d5
am: b24d054e08

Change-Id: I5da78067b623709a31afaeff2b339457a994eba1
2017-09-15 14:20:36 +00:00
Daniel Nishi
24968fa3c1 Merge "Fix work profile storage bugs." into oc-mr1-dev am: 67f0299a25
am: 08fe250704

Change-Id: I8c69cf593d2159c62bbea04d3b85bf65dd944448
2017-09-15 14:19:17 +00:00
Zhijun He
9ff38b38da Merge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev am: 1d45308e33
am: c1857e9841

Change-Id: I458e2c81bd15caa461da001bfdb5903944ebc375
2017-09-15 14:17:38 +00:00
Lei Yu
2f08bb66de Merge "Update the bluetooth battery icon" into oc-mr1-dev am: 04ba0f5067
am: e01900d9c5

Change-Id: I7560f9100b4778d72ad5e395b58d720aeb25438b
2017-09-15 11:15:08 +00:00
edgar.huang
ebe14617ba Merge "Don't need to authenticate fingerprint when the fingerprint list is empty." am: 62a021850f am: f95e7f9056 am: e7da16fc8f
am: d0331b8152

Change-Id: I7cd06b4d8f368c5a0843a173293ca0cf2ea43ebe
2017-09-15 06:49:35 +00:00
Daniel Nishi
d1743b5a09 Merge "Remove outdated storage search results." into oc-mr1-dev am: 11c325e85d
am: aec1784122

Change-Id: I3b2648a48059cbb4ec0b47ab43112a3dc9801012
2017-09-15 06:49:06 +00:00