Commit Graph

40628 Commits

Author SHA1 Message Date
TreeHugger Robot
10ba1f1ee7 Merge "Fix NPE when calling getSuggestionV2 in adapter." 2017-09-20 17:57:45 +00:00
Fan Zhang
a404be0032 Merge "Turn off WifiTetherSettings page." into oc-mr1-dev
am: b9da1117d0

Change-Id: I4f027adb993a7971f83d3fd659a86dc4392ae57e
2017-09-20 16:33:48 +00:00
Fan Zhang
45424c5464 Fix NPE when calling getSuggestionV2 in adapter.
Change-Id: I3aa498c2255107ca2e33046f3df629c2ef43ec5c
Fixes: 66111737
Test: robotest
2017-09-20 09:19:17 -07:00
TreeHugger Robot
b9da1117d0 Merge "Turn off WifiTetherSettings page." into oc-mr1-dev 2017-09-20 16:17:28 +00:00
Julia Reynolds
a25e54fdf6 Sometimes there's no advanced settings
Test: manual
Change-Id: Iea69ee04f36be51d073bbbd2c0d643c986eb8e89
Fixes: 65964886
2017-09-20 10:00:03 -04:00
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
TreeHugger Robot
3a5a5b8fe7 Merge "Import translations. DO NOT MERGE" 2017-09-19 17:52:37 +00: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
Lei Yu
373cbeb3d5 Merge "Enable the color lint check" 2017-09-19 01:57:06 +00:00
Bill Yi
6d02a30634 Import translations. DO NOT MERGE am: 0a0d3d1b86 -s ours
am: f874590924  -s ours

Change-Id: I87d6e097e4cb4736c6a6de23a871da6e8d726284
2017-09-19 01:06:54 +00:00
Bill Yi
f874590924 Import translations. DO NOT MERGE
am: 0a0d3d1b86  -s ours

Change-Id: I65871b7da2ee00f40b81803400ed9e28bf6e9479
2017-09-19 01:02:54 +00:00
jackqdyulei
01c13b7abd Enable the color lint check
We disabled color check because the error message was
ambiguous when the android environment hadn't been set
up.

Since the error mesage has been updated, we can turn it
back on.

Bug: 65850237
Test: repo upload .
Change-Id: I9517192b8b7d8131014e3ac44e3edb2d97134bb6
2017-09-18 17:01:23 -07: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
jackqdyulei
965a22d569 Disable the color lint check
Bug: 65850237
Test: Manual
Change-Id: If92b6490d92463d65302408e0288e6af93b97cbe
2017-09-18 15:15:08 -07:00
Bill Yi
0a0d3d1b86 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I26590b243087f80f96d29114d82a45acb4070f73
2017-09-18 14:15:14 -07:00
Bill Yi
96272fe747 Import translations. DO NOT MERGE
Change-Id: I8a776bfa60121f88e8509601ae39907cab9e6618
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-09-18 13:56:02 -07: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
Bill Yi
9b2c927e30 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: e28f601df8 -s ours
am: c30ad68d13  -s ours

Change-Id: Ib02b2c311487254675bd0cc73de9cefb2dbc2370
2017-09-16 20:55:58 +00:00
Bill Yi
c30ad68d13 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: e28f601df8  -s ours

Change-Id: I80cb3c4098d7aaa180254a2043bc0b89e6a3ba14
2017-09-16 20:36:29 +00:00
TreeHugger Robot
e28f601df8 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-09-16 19:39:25 +00:00
Bill Yi
59c56a56f8 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Iee41ee02215987d998f059b69c085479fcefbf29
2017-09-16 07:25:49 -07: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