OSDN Git Service
Fan Zhang [Fri, 22 Sep 2017 01:21:44 +0000 (18:21 -0700)]
Let SuggestionFeatureProvider manage SuggestionService name
Bug:
65065268
Test: robotests
Change-Id: I82315a7b1565dc34b516bf685ad8e831a1e28591
TreeHugger Robot [Thu, 21 Sep 2017 20:18:06 +0000 (20:18 +0000)]
Merge "Fix pattern header string usage"
Doris Ling [Thu, 21 Sep 2017 19:31:54 +0000 (19:31 +0000)]
Merge "Fix NPE crash in UsageAccessDetails" am:
cd959f28a0 am:
296c46404c am:
c13415391b
am:
913d1667ce
Change-Id: Ib859bec6cd9ca1422856d091fc7a0b9894397b04
Doris Ling [Thu, 21 Sep 2017 19:29:53 +0000 (19:29 +0000)]
Merge "Fix NPE crash in UsageAccessDetails" am:
cd959f28a0 am:
296c46404c
am:
c13415391b
Change-Id: I8e5050b2b4c5884b93ef56155f50d1fffcc13579
Doris Ling [Thu, 21 Sep 2017 19:27:20 +0000 (19:27 +0000)]
Merge "Fix NPE crash in UsageAccessDetails" am:
cd959f28a0
am:
296c46404c
Change-Id: I38483ed934187e185efc6a2e38ddde7cef0c4e8f
Doris Ling [Thu, 21 Sep 2017 19:24:52 +0000 (19:24 +0000)]
Merge "Fix NPE crash in UsageAccessDetails"
am:
cd959f28a0
Change-Id: I21f898f7ec8fd67d4f29d73491b4ac57cad7a252
Doris Ling [Thu, 21 Sep 2017 19:21:03 +0000 (19:21 +0000)]
Merge "Fix NPE crash in UsageAccessDetails"
Maurice Lam [Thu, 21 Sep 2017 18:33:55 +0000 (11:33 -0700)]
Fix pattern header string usage
Test: Builds with ag/
2933970 cherry-picked on top
Bug:
66446463
Change-Id: I0c649427474cd9b1cf388f45407deea582d01c9a
Bill Yi [Thu, 21 Sep 2017 17:57:41 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
17acd3d1c8 -s ours
am:
d516ba6a80 -s ours
Change-Id: I97a4c786fb415114d96035896128e874402676a1
Bill Yi [Thu, 21 Sep 2017 17:53:43 +0000 (17:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
17acd3d1c8 -s ours
Change-Id: I1813ac496b209342c8326a8107b2597691f16da1
TreeHugger Robot [Thu, 21 Sep 2017 17:48:00 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Julia Reynolds [Thu, 21 Sep 2017 11:39:22 +0000 (11:39 +0000)]
Merge "Sometimes there's no advanced settings" into oc-mr1-dev am:
a639e32289
am:
b0f3f6ce05
Change-Id: I188274147f7a4a5963e385a98adcef47e45d7069
Julia Reynolds [Thu, 21 Sep 2017 11:36:50 +0000 (11:36 +0000)]
Merge "Sometimes there's no advanced settings" into oc-mr1-dev
am:
a639e32289
Change-Id: Ib737041715e76a70d2c2fc703100cebbc95a2501
Julia Reynolds [Thu, 21 Sep 2017 11:33:09 +0000 (11:33 +0000)]
Merge "Sometimes there's no advanced settings" into oc-mr1-dev
tiansiming [Tue, 19 Sep 2017 10:16:19 +0000 (18:16 +0800)]
Fix NPE crash in UsageAccessDetails
mPackageInfo will be null in RefreshUI method in UsageAccessDetails.java
Bug:https://issuetracker.google.com/issues/
65872768
Test:As explained in the link above
Change-Id: I8bd4b822cfe5d8a3347ca7f5886605cbdfb9b8b6
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
Jack He [Thu, 21 Sep 2017 05:07:36 +0000 (05:07 +0000)]
Bluetooth: remove unnecessary state tracking in BluetoothSummaryUpdater am:
ac040e3b1f
am:
1197438540
Change-Id: I1ee2b808431c7eb324bc30e43c34f5e4799281f2
Fan Zhang [Thu, 21 Sep 2017 05:06:57 +0000 (05:06 +0000)]
Merge "Turn off WifiTetherSettings page." into oc-mr1-dev am:
b9da1117d0
am:
a404be0032 -s ours
Change-Id: If4c88526ec4c0dac39ba53974494720ec14c9d97
Bill Yi [Thu, 21 Sep 2017 01:33:03 +0000 (18:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic65c57bb8ef17b6babd0dab69072b07a70e2b5ec
Jeffrey Huang [Thu, 21 Sep 2017 00:54:18 +0000 (00:54 +0000)]
Merge "Revert "Introduce CoolColorTemperaturePreferenceController""
Jeffrey Huang [Thu, 21 Sep 2017 00:33:40 +0000 (00:33 +0000)]
Revert "Introduce CoolColorTemperaturePreferenceController"
This reverts commit
ebcf01f128422e82bf6bcd29dab8836efb94430f.
Change-Id: Ie26f1790833741e56012dda95702f087d867c552
Jeffrey Huang [Thu, 21 Sep 2017 00:01:51 +0000 (00:01 +0000)]
Merge "Introduce CoolColorTemperaturePreferenceController"
TreeHugger Robot [Wed, 20 Sep 2017 23:29:51 +0000 (23:29 +0000)]
Merge "Add isAvailable check to devOptionsController"
jeffreyhuang [Mon, 18 Sep 2017 22:24:01 +0000 (15:24 -0700)]
Introduce CoolColorTemperaturePreferenceController
- Create new CoolColorTemperaturePreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ib138dd55f197ae4cc14db4f3414abdd644e6b202
Jack He [Wed, 20 Sep 2017 21:43:24 +0000 (21:43 +0000)]
Bluetooth: remove unnecessary state tracking in BluetoothSummaryUpdater
am:
ac040e3b1f
Change-Id: I13a2bd7e40a94773fc0afe37d71d7ba60e2b625b
jeffreyhuang [Tue, 19 Sep 2017 17:44:30 +0000 (10:44 -0700)]
Add isAvailable check to devOptionsController
- This avoids the null check for PreferenceControllers where isAvailable()
is not always true
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ibed8bc6a2a812355c521620d77fb571c1fd8a649
TreeHugger Robot [Wed, 20 Sep 2017 20:32:37 +0000 (20:32 +0000)]
Merge "Add since_visible_millis to Settings action logs."
Jeffrey Huang [Wed, 20 Sep 2017 20:26:57 +0000 (20:26 +0000)]
Merge changes from topic "OemUnlockPreference"
* changes:
Add comments to avoid merge conflicts
Introduce OemUnlockPreferenceController
Jack He [Tue, 12 Sep 2017 23:26:06 +0000 (16:26 -0700)]
Bluetooth: remove unnecessary state tracking in BluetoothSummaryUpdater
* LocalBluetoothAdapter is already a cache of BluetoothAdapter and its
methods should be used directly to obtain states instead of caching them
in BluetoothSummaryUpdater
- Use LocalBluetoothAdapter.isEnabled() to check whether Bluetooth
is enabled
- Use LocalBluetoothAdapter.getBondedDevices() to get list of bonded
devices
* BluetoothDevice is a stable Bluetooth API and its methods should not
incur large latency. We should use API methods as much as possible to
avoid intermediate wrappers
- Use BluetoothDevice.isConnected() to check if a device is connected
* Add more logging messages in error conditions
* Show status as "Not Connected" when there is a state mismatch (i.e.
adapter says it is connected, but no bonded device is connected)
* Updated unit tests to reflect the latest behavior
Bug:
65591907
Test: make, unit test, pair with Bluetooth devices, check Settings UI
Change-Id: I0fa54959c8bed8ac67a935f150785ba8197d0411
Eric Schwarzenbach [Thu, 14 Sep 2017 18:09:21 +0000 (11:09 -0700)]
Add since_visible_millis to Settings action logs.
This change adds a new action logging method on MetricsFeatureProvider
within Settings.
Uses the VisibilityLoggerMixin to calculate the elapsed time since
the fragment has been visible. Adds tagged data in
MetricsFeatureProvider#action() to store this elapsed time in
NOTIFICATION_SINCE_VISIBLE_MILLIS in MetricsEvents. Modifies the
LogWriter interface to accept variadic taggedData args in its action()
methods. Annotates the old subtype #action() methods as deprecated.
EventLogWriter also no longer casts the subtype values to strings before
sending them to MetricsLogger, so they are correctly stored as subtype
instead of package.
Bug:
65371699,
65631695
Test: make RunSettingsRoboTests
Change-Id: Iec6a61dd6a49ab237e2bdc4469fed45e89d9c380
TreeHugger Robot [Wed, 20 Sep 2017 17:57:45 +0000 (17:57 +0000)]
Merge "Fix NPE when calling getSuggestionV2 in adapter."
Fan Zhang [Wed, 20 Sep 2017 16:33:48 +0000 (16:33 +0000)]
Merge "Turn off WifiTetherSettings page." into oc-mr1-dev
am:
b9da1117d0
Change-Id: I4f027adb993a7971f83d3fd659a86dc4392ae57e
Fan Zhang [Wed, 20 Sep 2017 16:01:38 +0000 (09:01 -0700)]
Fix NPE when calling getSuggestionV2 in adapter.
Change-Id: I3aa498c2255107ca2e33046f3df629c2ef43ec5c
Fixes:
66111737
Test: robotest
TreeHugger Robot [Wed, 20 Sep 2017 16:17:28 +0000 (16:17 +0000)]
Merge "Turn off WifiTetherSettings page." into oc-mr1-dev
Julia Reynolds [Wed, 20 Sep 2017 14:00:03 +0000 (10:00 -0400)]
Sometimes there's no advanced settings
Test: manual
Change-Id: Iea69ee04f36be51d073bbbd2c0d643c986eb8e89
Fixes:
65964886
Christine Franks [Wed, 20 Sep 2017 01:23:44 +0000 (18:23 -0700)]
resolve merge conflicts of
92f7794d90 to master
Test: I solemnly swer I tested this conflict resolution.
Change-Id: I2cbcd06b906904365f9257742ab1c51b67adc3af
Christine Franks [Wed, 20 Sep 2017 00:43:25 +0000 (00:43 +0000)]
Merge "Handle night display state when timezone changes" into oc-mr1-dev
am:
cb52e803bf
Change-Id: I16968b7e1572cb91afc2345a16437194b243a955
Christine Franks [Wed, 20 Sep 2017 00:23:29 +0000 (00:23 +0000)]
Merge "Handle night display state when timezone changes" into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 23:36:38 +0000 (23:36 +0000)]
Merge "Load suggestions through SettingsIntelligence."
Doris Ling [Tue, 19 Sep 2017 22:51:04 +0000 (22:51 +0000)]
Merge "Add log to help debug crash."
Ajay Nadathur [Tue, 19 Sep 2017 22:36:09 +0000 (22:36 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev am:
dc66f96dda
am:
b4b657179f
Change-Id: I86c4f0b77dd9be9926e92dd5c2cd57cce5c3e3d4
Ajay Nadathur [Tue, 19 Sep 2017 22:26:18 +0000 (22:26 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev
am:
dc66f96dda
Change-Id: I7ca36b1a5712b2ed3ec890bab376b9cc63dd1c8b
TreeHugger Robot [Tue, 19 Sep 2017 22:13:30 +0000 (22:13 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev
Sundeep Ghuman [Tue, 19 Sep 2017 21:22:08 +0000 (21:22 +0000)]
Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev am:
77aeb2a0a7
am:
ea98db9946
Change-Id: I5b125c60c4cc39b8f8661b2eff6d19de0c1c5eff
Sundeep Ghuman [Tue, 19 Sep 2017 21:14:05 +0000 (21:14 +0000)]
Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev
am:
77aeb2a0a7
Change-Id: I86e514f4a8d9546e4d2e60bc7967ba8bdf4e0a8c
TreeHugger Robot [Tue, 19 Sep 2017 20:56:34 +0000 (20:56 +0000)]
Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev
Doris Ling [Tue, 19 Sep 2017 20:50:31 +0000 (13:50 -0700)]
Add log to help debug crash.
Bug:
65745404
Test: make RunSettingsRoboTests
Change-Id: Ia0d1de57ed33a08a54294e4b9895464e219cbc90
jeffreyhuang [Mon, 18 Sep 2017 21:29:24 +0000 (14:29 -0700)]
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
jeffreyhuang [Fri, 15 Sep 2017 23:01:34 +0000 (16:01 -0700)]
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
Fan Zhang [Thu, 17 Aug 2017 23:13:20 +0000 (16:13 -0700)]
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
Ajay Nadathur [Fri, 15 Sep 2017 00:33:28 +0000 (17:33 -0700)]
Deferred setup banner updates intermittently
bug:
65641145
Test: Manually tested
Change-Id: I8661006ac1560dc1b6ce6f17205983003a231125
Salvador Martinez [Tue, 19 Sep 2017 18:11:11 +0000 (18:11 +0000)]
Merge "remove old anomaly code"
Christine Franks [Fri, 25 Aug 2017 21:02:42 +0000 (14:02 -0700)]
Handle night display state when timezone changes
Bug:
64458884
Test: make RunSettingsRoboTests -j100
Change-Id: I1f0c073b796aa6826c236757e19c6ff6d5cb7602
TreeHugger Robot [Tue, 19 Sep 2017 17:52:37 +0000 (17:52 +0000)]
Merge "Import translations. DO NOT MERGE"
Fan Zhang [Mon, 18 Sep 2017 23:16:57 +0000 (16:16 -0700)]
Turn off WifiTetherSettings page.
Merged-In: If92798ddf075801e66cd97ecacff2f8df1e41985
Change-Id: Idab770509a8049907a256cce2b8f00f236c2dbdc
Fixes:
65852564
Test: rerun robotests
Test: new instrumentation test to check flag initial state
TreeHugger Robot [Tue, 19 Sep 2017 03:57:59 +0000 (03:57 +0000)]
Merge "Update strings for pattern screens"
Lei Yu [Tue, 19 Sep 2017 01:57:06 +0000 (01:57 +0000)]
Merge "Enable the color lint check"
Bill Yi [Tue, 19 Sep 2017 01:06:54 +0000 (01:06 +0000)]
Import translations. DO NOT MERGE am:
0a0d3d1b86 -s ours
am:
f874590924 -s ours
Change-Id: I87d6e097e4cb4736c6a6de23a871da6e8d726284
Bill Yi [Tue, 19 Sep 2017 01:02:54 +0000 (01:02 +0000)]
Import translations. DO NOT MERGE
am:
0a0d3d1b86 -s ours
Change-Id: I65871b7da2ee00f40b81803400ed9e28bf6e9479
jackqdyulei [Mon, 18 Sep 2017 23:32:59 +0000 (16:32 -0700)]
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
Doris Ling [Mon, 18 Sep 2017 21:58:31 +0000 (14:58 -0700)]
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
TreeHugger Robot [Mon, 18 Sep 2017 22:19:56 +0000 (22:19 +0000)]
Merge "Refresh Wifi AP Config display when config changes"
jackqdyulei [Mon, 18 Sep 2017 22:15:08 +0000 (15:15 -0700)]
Disable the color lint check
Bug:
65850237
Test: Manual
Change-Id: If92b6490d92463d65302408e0288e6af93b97cbe
Bill Yi [Mon, 18 Sep 2017 21:15:14 +0000 (14:15 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I26590b243087f80f96d29114d82a45acb4070f73
Bill Yi [Mon, 18 Sep 2017 20:56:02 +0000 (13:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8a776bfa60121f88e8509601ae39907cab9e6618
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Fan Zhang [Fri, 1 Sep 2017 18:10:37 +0000 (11:10 -0700)]
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
TreeHugger Robot [Mon, 18 Sep 2017 19:32:03 +0000 (19:32 +0000)]
Merge "Don't init batterystats in onCreate()"
TreeHugger Robot [Sat, 16 Sep 2017 23:53:49 +0000 (23:53 +0000)]
Merge "Introduce BluetoothSnoopLogPreferenceController"
TreeHugger Robot [Sat, 16 Sep 2017 23:44:36 +0000 (23:44 +0000)]
Merge "Introduce DeveloperOptionsPreferenceController"
Bill Yi [Sat, 16 Sep 2017 20:55:58 +0000 (20:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
e28f601df8 -s ours
am:
c30ad68d13 -s ours
Change-Id: Ib02b2c311487254675bd0cc73de9cefb2dbc2370
Bill Yi [Sat, 16 Sep 2017 20:36:29 +0000 (20:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
e28f601df8 -s ours
Change-Id: I80cb3c4098d7aaa180254a2043bc0b89e6a3ba14
TreeHugger Robot [Sat, 16 Sep 2017 19:39:25 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 14:25:49 +0000 (07:25 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Iee41ee02215987d998f059b69c085479fcefbf29
TreeHugger Robot [Sat, 16 Sep 2017 02:41:27 +0000 (02:41 +0000)]
Merge "Move SuggestionService AIDL related calls to a controller."
Fan Zhang [Sat, 16 Sep 2017 00:40:43 +0000 (00:40 +0000)]
Merge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev am:
a42e9351c5
am:
3f070569a6
Change-Id: I7bf58afdb746d70b2a2728875b83d0f0c547d51e
Fan Zhang [Sat, 16 Sep 2017 00:38:15 +0000 (00:38 +0000)]
Merge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev
am:
a42e9351c5
Change-Id: I21dc2b1866a7f9b0bef5eae84887780a985e1884
TreeHugger Robot [Sat, 16 Sep 2017 00:33:33 +0000 (00:33 +0000)]
Merge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev
Fan Zhang [Sat, 16 Sep 2017 00:10:24 +0000 (17:10 -0700)]
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
jeffreyhuang [Thu, 14 Sep 2017 21:02:39 +0000 (14:02 -0700)]
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
jeffreyhuang [Thu, 14 Sep 2017 00:09:13 +0000 (17:09 -0700)]
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
Fan Zhang [Fri, 15 Sep 2017 20:22:04 +0000 (13:22 -0700)]
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
Lei Yu [Fri, 15 Sep 2017 21:46:59 +0000 (21:46 +0000)]
Merge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev am:
c872c14785
am:
3a01adad6d
Change-Id: I4669be435441db3e94bd06afafeaf693c3fa614e
Lei Yu [Fri, 15 Sep 2017 21:45:00 +0000 (21:45 +0000)]
Merge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev
am:
c872c14785
Change-Id: I0f56d26a42ef107be632d360e944975db8e73b1d
TreeHugger Robot [Fri, 15 Sep 2017 21:40:04 +0000 (21:40 +0000)]
Merge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev
Doris Ling [Fri, 15 Sep 2017 21:38:31 +0000 (21:38 +0000)]
Merge "Add a new feature flag for the expand button in support lib."
Doris Ling [Fri, 15 Sep 2017 01:54:48 +0000 (18:54 -0700)]
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
jackqdyulei [Thu, 14 Sep 2017 23:11:02 +0000 (16:11 -0700)]
Hook up lint color check to settings
After this cl, settings will run hardcoded color check
(go/color-check-guideline) for all the cls in pre-upload.
This check will prompt error message if cl contains hardcoded color.
Bug:
32750778
Test: repo upload .
Change-Id: Id35ded5199094a14fcc4eeebc470164d052e278e
Lei Yu [Fri, 15 Sep 2017 18:01:13 +0000 (18:01 +0000)]
Revert "Turn on wakeupAlarm anomaly detector"
This reverts commit
1a49a8ab3900ab77209b1c5b34a33cc3a8be3e2c.
Bug:
65738439
Test: RunSettingsRoboTests
Change-Id: Ifb2f72ba51e229b9387ff5a977bd51b229fcdf6a
TreeHugger Robot [Fri, 15 Sep 2017 18:01:46 +0000 (18:01 +0000)]
Merge "Simplify IndexData builder"
Antony Sargent [Fri, 15 Sep 2017 17:44:11 +0000 (17:44 +0000)]
Merge "Bring back "Turning on hotspot" status text when starting hotspot" into oc-mr1-dev am:
b991dcd1b8
am:
a99dea8e66
Change-Id: Ie52a604be9901600b4d94eed77cfa43c1761fbd8
Antony Sargent [Fri, 15 Sep 2017 17:42:26 +0000 (17:42 +0000)]
Merge "Bring back "Turning on hotspot" status text when starting hotspot" into oc-mr1-dev
am:
b991dcd1b8
Change-Id: I738bde4deee58ab84f24302048534f657698603b
Antony Sargent [Fri, 15 Sep 2017 17:32:07 +0000 (17:32 +0000)]
Merge "Bring back "Turning on hotspot" status text when starting hotspot" into oc-mr1-dev
Doris Ling [Fri, 15 Sep 2017 14:20:36 +0000 (14:20 +0000)]
Merge "Default apps settings disappear when switching to secondary user" am:
939265d6ea am:
0533f9ff4a am:
18c3bde1d5
am:
b24d054e08
Change-Id: I5da78067b623709a31afaeff2b339457a994eba1
Soroosh Mariooryad [Fri, 15 Sep 2017 14:20:00 +0000 (14:20 +0000)]
Merge "Log smart settings suggestion enabled/disabled state for A/B experiments" into oc-mr1-dev am:
339fd95209
am:
d4b767789d -s ours
Change-Id: I4413e04872d7a2221773ddc38f45531a8ce9b932
Daniel Nishi [Fri, 15 Sep 2017 14:19:17 +0000 (14:19 +0000)]
Merge "Fix work profile storage bugs." into oc-mr1-dev am:
67f0299a25
am:
08fe250704
Change-Id: I8c69cf593d2159c62bbea04d3b85bf65dd944448
Zhijun He [Fri, 15 Sep 2017 14:17:38 +0000 (14:17 +0000)]
Merge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev am:
1d45308e33
am:
c1857e9841
Change-Id: I458e2c81bd15caa461da001bfdb5903944ebc375
Lei Yu [Fri, 15 Sep 2017 11:15:08 +0000 (11:15 +0000)]
Merge "Update the bluetooth battery icon" into oc-mr1-dev am:
04ba0f5067
am:
e01900d9c5
Change-Id: I7560f9100b4778d72ad5e395b58d720aeb25438b
edgar.huang [Fri, 15 Sep 2017 06:49:35 +0000 (06:49 +0000)]
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty." am:
62a021850f am:
f95e7f9056 am:
e7da16fc8f
am:
d0331b8152
Change-Id: I7cd06b4d8f368c5a0843a173293ca0cf2ea43ebe
Daniel Nishi [Fri, 15 Sep 2017 06:49:06 +0000 (06:49 +0000)]
Merge "Remove outdated storage search results." into oc-mr1-dev am:
11c325e85d
am:
aec1784122
Change-Id: I3b2648a48059cbb4ec0b47ab43112a3dc9801012
Daniel Nishi [Fri, 15 Sep 2017 06:48:39 +0000 (06:48 +0000)]
Merge "Close the load screen faster on pre-quota devices." into oc-mr1-dev am:
f42b529143
am:
598386ebab
Change-Id: I775f8b438eb6452bdbb2422efe4a56661c2ae7ed
Doris Ling [Fri, 15 Sep 2017 03:33:54 +0000 (03:33 +0000)]
Merge "Default apps settings disappear when switching to secondary user" am:
939265d6ea am:
0533f9ff4a
am:
18c3bde1d5
Change-Id: I3173e35feaf21bbc2dc0abd8eb561fc0251fa5ba
OSDN Git Service
