OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 21 Sep 2017 01:21:02 +0000 (18:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iaff8bc5d7a9feb9e1cd9e8054ca588a45431a75c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoMerge "Add since_visible_millis to Settings action logs."
TreeHugger Robot [Wed, 20 Sep 2017 20:32:37 +0000 (20:32 +0000)]
Merge "Add since_visible_millis to Settings action logs."

6 years agoMerge changes from topic "OemUnlockPreference"
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

6 years agoAdd since_visible_millis to Settings action logs.
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: 6537169965631695
Test: make RunSettingsRoboTests
Change-Id: Iec6a61dd6a49ab237e2bdc4469fed45e89d9c380

6 years agoMerge "Fix NPE when calling getSuggestionV2 in adapter."
TreeHugger Robot [Wed, 20 Sep 2017 17:57:45 +0000 (17:57 +0000)]
Merge "Fix NPE when calling getSuggestionV2 in adapter."

6 years agoFix NPE when calling getSuggestionV2 in adapter.
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

6 years agoresolve merge conflicts of 92f7794d90 to master
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

6 years agoMerge "Handle night display state when timezone changes" into oc-mr1-dev
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

6 years agoMerge "Handle night display state when timezone changes" into oc-mr1-dev
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

6 years agoMerge "Load suggestions through SettingsIntelligence."
TreeHugger Robot [Tue, 19 Sep 2017 23:36:38 +0000 (23:36 +0000)]
Merge "Load suggestions through SettingsIntelligence."

6 years agoMerge "Add log to help debug crash."
Doris Ling [Tue, 19 Sep 2017 22:51:04 +0000 (22:51 +0000)]
Merge "Add log to help debug crash."

6 years agoMerge "Deferred setup banner updates intermittently" into oc-mr1-dev am: dc66f96dda
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

6 years agoMerge "Deferred setup banner updates intermittently" into oc-mr1-dev
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

6 years agoMerge "Deferred setup banner updates intermittently" into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 22:13:30 +0000 (22:13 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev

6 years agoMerge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev am: 77aeb2a0a7
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

6 years agoMerge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev
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

6 years agoMerge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 20:56:34 +0000 (20:56 +0000)]
Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev

6 years agoAdd log to help debug crash.
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

6 years agoAdd comments to avoid merge conflicts
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

6 years agoIntroduce OemUnlockPreferenceController
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

6 years agoLoad suggestions through SettingsIntelligence.
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

6 years agoDeferred setup banner updates intermittently
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

6 years agoMerge "remove old anomaly code"
Salvador Martinez [Tue, 19 Sep 2017 18:11:11 +0000 (18:11 +0000)]
Merge "remove old anomaly code"

6 years agoHandle night display state when timezone changes
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

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 19 Sep 2017 17:52:37 +0000 (17:52 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Update strings for pattern screens"
TreeHugger Robot [Tue, 19 Sep 2017 03:57:59 +0000 (03:57 +0000)]
Merge "Update strings for pattern screens"

6 years agoMerge "Enable the color lint check"
Lei Yu [Tue, 19 Sep 2017 01:57:06 +0000 (01:57 +0000)]
Merge "Enable the color lint check"

6 years agoImport translations. DO NOT MERGE am: 0a0d3d1b86 -s ours
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoEnable the color lint check
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

6 years agoAdd metadata handling for specifying tile order.
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

6 years agoMerge "Refresh Wifi AP Config display when config changes"
TreeHugger Robot [Mon, 18 Sep 2017 22:19:56 +0000 (22:19 +0000)]
Merge "Refresh Wifi AP Config display when config changes"

6 years agoDisable the color lint check
jackqdyulei [Mon, 18 Sep 2017 22:15:08 +0000 (15:15 -0700)]
Disable the color lint check

Bug: 65850237
Test: Manual
Change-Id: If92b6490d92463d65302408e0288e6af93b97cbe

6 years agoImport translations. DO NOT MERGE
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoRefresh Wifi AP Config display when config changes
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

6 years agoMerge "Don't init batterystats in onCreate()"
TreeHugger Robot [Mon, 18 Sep 2017 19:32:03 +0000 (19:32 +0000)]
Merge "Don't init batterystats in onCreate()"

6 years agoMerge "Introduce BluetoothSnoopLogPreferenceController"
TreeHugger Robot [Sat, 16 Sep 2017 23:53:49 +0000 (23:53 +0000)]
Merge "Introduce BluetoothSnoopLogPreferenceController"

6 years agoMerge "Introduce DeveloperOptionsPreferenceController"
TreeHugger Robot [Sat, 16 Sep 2017 23:44:36 +0000 (23:44 +0000)]
Merge "Introduce DeveloperOptionsPreferenceController"

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: e28f601df8 -s ours
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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 16 Sep 2017 19:39:25 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
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

6 years agoMerge "Move SuggestionService AIDL related calls to a controller."
TreeHugger Robot [Sat, 16 Sep 2017 02:41:27 +0000 (02:41 +0000)]
Merge "Move SuggestionService AIDL related calls to a controller."

6 years agoMerge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev am...
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

6 years agoMerge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev
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

6 years agoMerge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev
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

6 years agoMove SuggestionService AIDL related calls to a controller.
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

6 years agoIntroduce BluetoothSnoopLogPreferenceController
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

6 years agoIntroduce DeveloperOptionsPreferenceController
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

6 years agoUse "mid" stable id for condition cards conditionally.
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

6 years agoMerge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev am: c872c14785
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

6 years agoMerge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev
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

6 years agoMerge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev
TreeHugger Robot [Fri, 15 Sep 2017 21:40:04 +0000 (21:40 +0000)]
Merge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev

6 years agoMerge "Add a new feature flag for the expand button in support lib."
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."

6 years agoAdd 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

6 years agoHook up lint color check to settings
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

6 years agoRevert "Turn on wakeupAlarm anomaly detector"
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

6 years agoMerge "Simplify IndexData builder"
TreeHugger Robot [Fri, 15 Sep 2017 18:01:46 +0000 (18:01 +0000)]
Merge "Simplify IndexData builder"

6 years agoMerge "Bring back "Turning on hotspot" status text when starting hotspot" into oc...
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

6 years agoMerge "Bring back "Turning on hotspot" status text when starting hotspot" into oc...
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

6 years agoMerge "Bring back "Turning on hotspot" status text when starting hotspot" into oc...
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

6 years agoMerge "Default apps settings disappear when switching to secondary user" am: 939265d6...
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

6 years agoMerge "Log smart settings suggestion enabled/disabled state for A/B experiments"...
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

6 years agoMerge "Fix work profile storage bugs." into oc-mr1-dev am: 67f0299a25
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

6 years agoMerge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev am: 1d45308e33
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

6 years agoMerge "Update the bluetooth battery icon" into oc-mr1-dev am: 04ba0f5067
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

6 years agoMerge "Don't need to authenticate fingerprint when the fingerprint list is empty...
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

6 years agoMerge "Remove outdated storage search results." into oc-mr1-dev am: 11c325e85d
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

6 years agoMerge "Close the load screen faster on pre-quota devices." into oc-mr1-dev am: f42b529143
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

6 years agoMerge "Default apps settings disappear when switching to secondary user" am: 939265d6...
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

6 years agoMerge "Consolidate all wrappers used for testing."
TreeHugger Robot [Fri, 15 Sep 2017 03:14:52 +0000 (03:14 +0000)]
Merge "Consolidate all wrappers used for testing."

6 years agoMerge "Log smart settings suggestion enabled/disabled state for A/B experiments"...
Soroosh Mariooryad [Fri, 15 Sep 2017 02:57:54 +0000 (02:57 +0000)]
Merge "Log smart settings suggestion enabled/disabled state for A/B experiments" into oc-mr1-dev
am: 339fd95209

Change-Id: I641e80fa3678d5b3dd1dec07a908a9561c4460b9

6 years agoMerge "Fix work profile storage bugs." into oc-mr1-dev
Daniel Nishi [Fri, 15 Sep 2017 02:57:09 +0000 (02:57 +0000)]
Merge "Fix work profile storage bugs." into oc-mr1-dev
am: 67f0299a25

Change-Id: Ia30e1b297d8c4f9b4167f09e92f1ce1645b26977

6 years agoMerge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev
Zhijun He [Fri, 15 Sep 2017 02:55:48 +0000 (02:55 +0000)]
Merge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev
am: 1d45308e33

Change-Id: If97d1cddbb044fde52197cd08f0c34cad9abe901

6 years agoMerge "Default apps settings disappear when switching to secondary user" am: 939265d6ea
Doris Ling [Fri, 15 Sep 2017 02:06:37 +0000 (02:06 +0000)]
Merge "Default apps settings disappear when switching to secondary user" am: 939265d6ea
am: 0533f9ff4a

Change-Id: Ib3175a8ffbba9e229bb86cb561c63342f20608bc

6 years agoMerge "Default apps settings disappear when switching to secondary user"
Doris Ling [Fri, 15 Sep 2017 01:33:16 +0000 (01:33 +0000)]
Merge "Default apps settings disappear when switching to secondary user"
am: 939265d6ea

Change-Id: I8f874e741b950079482c3c09eb7ec1c3ac5f57fd

6 years agoConsolidate all wrappers used for testing.
Doris Ling [Thu, 31 Aug 2017 23:17:30 +0000 (16:17 -0700)]
Consolidate all wrappers used for testing.

- Add the wrapper package and move all wrappers to the wrapper package.
- Get rid of some wrapper interface/impl implementation and have a
wrapper class directly.

Bug: 65634579
Test: make RunSettingsRoboTests
Change-Id: Ic757d8f7bacfa7a034c7e692205bc1dc4b0e1de1

6 years agoMerge "Log smart settings suggestion enabled/disabled state for A/B experiments"...
Soroosh Mariooryad [Fri, 15 Sep 2017 01:12:48 +0000 (01:12 +0000)]
Merge "Log smart settings suggestion enabled/disabled state for A/B experiments" into oc-mr1-dev

6 years agoMerge "Fix work profile storage bugs." into oc-mr1-dev
Daniel Nishi [Fri, 15 Sep 2017 00:58:59 +0000 (00:58 +0000)]
Merge "Fix work profile storage bugs." into oc-mr1-dev

6 years agoAdd feature flag for suggestion/SettingsIntelligence integ.
Fan Zhang [Thu, 14 Sep 2017 23:04:35 +0000 (16:04 -0700)]
Add feature flag for suggestion/SettingsIntelligence integ.

Bug: 65065268
Test: robotests
Change-Id: I42e1f8b01d7b82de3b94bd77943a9a119adf5867

6 years agoMerge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 22:30:11 +0000 (22:30 +0000)]
Merge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev

6 years agoMerge "Default apps settings disappear when switching to secondary user"
Doris Ling [Thu, 14 Sep 2017 22:13:58 +0000 (22:13 +0000)]
Merge "Default apps settings disappear when switching to secondary user"

6 years agoMerge "Integrate with SettingsIntelligence"
TreeHugger Robot [Thu, 14 Sep 2017 21:52:16 +0000 (21:52 +0000)]
Merge "Integrate with SettingsIntelligence"

6 years agoSimplify IndexData builder
Matthew Fritze [Tue, 22 Aug 2017 22:51:50 +0000 (15:51 -0700)]
Simplify IndexData builder

This is a small refactor in the large game of refactoring
DatabeseIndexingManager, and the general indexing pipeline
for Settings search.

This change is centered around hiding the normalization of
data (title, summary, keywords) from the data collector,
and putting that responsibility into the IndexData object.

In a future CL, we may move this again to the controller
that actually indexes the data.

Note, the conversion from PreIndexData to IndexData is
still messy, but until I can write a CL that just
rearranges the code, we must stay patient and vigilant.

Bug: 33577327
Test: make RunSettingsRoboTests
Change-Id: I53543d3d9c74a61380601297c55b6e4fea13031a

6 years agoMerge "Update the bluetooth battery icon" into oc-mr1-dev
Lei Yu [Thu, 14 Sep 2017 21:40:26 +0000 (21:40 +0000)]
Merge "Update the bluetooth battery icon" into oc-mr1-dev
am: 04ba0f5067

Change-Id: Ibc55937908be092c78ddac484226187276e87ee2

6 years agoMerge "Update the bluetooth battery icon" into oc-mr1-dev
Lei Yu [Thu, 14 Sep 2017 21:31:13 +0000 (21:31 +0000)]
Merge "Update the bluetooth battery icon" into oc-mr1-dev

6 years agoMerge "Don't need to authenticate fingerprint when the fingerprint list is empty...
edgar.huang [Thu, 14 Sep 2017 20:41:44 +0000 (20:41 +0000)]
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty." am: 62a021850f am: f95e7f9056
am: e7da16fc8f

Change-Id: Idd10ba2234522c1679ebfbbc48c7bfda742f0a4e

6 years agoMerge "Don't need to authenticate fingerprint when the fingerprint list is empty...
edgar.huang [Thu, 14 Sep 2017 20:39:42 +0000 (20:39 +0000)]
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty." am: 62a021850f
am: f95e7f9056

Change-Id: Ie6b48a64c62371cd276112b5b149fdf63341bb6f

6 years agoMerge "Don't need to authenticate fingerprint when the fingerprint list is empty."
edgar.huang [Thu, 14 Sep 2017 20:37:15 +0000 (20:37 +0000)]
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty."
am: 62a021850f

Change-Id: I6baf91aa5b558616e3d30aaa2edbdbc0f47072c3

6 years agoMerge "Don't need to authenticate fingerprint when the fingerprint list is empty."
Treehugger Robot [Thu, 14 Sep 2017 20:28:55 +0000 (20:28 +0000)]
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty."

6 years agoRevert "Settings: Enable HAL HDR+ by default"
Zhijun He [Thu, 14 Sep 2017 19:01:42 +0000 (12:01 -0700)]
Revert "Settings: Enable HAL HDR+ by default"

This reverts commit 14c4b41f789541628070f3a2d23207239d4f7ae8.

Bug: 65679683

6 years agoBring back "Turning on hotspot" status text when starting hotspot
Antony Sargent [Thu, 14 Sep 2017 17:52:44 +0000 (10:52 -0700)]
Bring back "Turning on hotspot" status text when starting hotspot

We accidentally regressed showing this text when starting the hotspot in
the refactor ag/2381595.

Bug: 64811203
Test: make RunSettingsRoboTests

6 years agoMerge "Remove outdated storage search results." into oc-mr1-dev
Daniel Nishi [Thu, 14 Sep 2017 18:08:00 +0000 (18:08 +0000)]
Merge "Remove outdated storage search results." into oc-mr1-dev
am: 11c325e85d

Change-Id: I8633076bab4293c05a2703ed5cad7f59afdf0fb5

6 years agoMerge "Close the load screen faster on pre-quota devices." into oc-mr1-dev
Daniel Nishi [Thu, 14 Sep 2017 18:07:16 +0000 (18:07 +0000)]
Merge "Close the load screen faster on pre-quota devices." into oc-mr1-dev
am: f42b529143

Change-Id: I3a8888fe8e555876ed058c29a91f1e9f17d82324

6 years agoFix work profile storage bugs.
Daniel Nishi [Tue, 12 Sep 2017 23:52:17 +0000 (16:52 -0700)]
Fix work profile storage bugs.

This makes apps and files in the work profile show up only for the work profile.
It turns out the primary profile's user id was getting piped down to the
special files views and it was showing the primary profile's file sizes
instead of the work ones.

Change-Id: If9c175f24920513c624c522d838bcdbe925566d1
Fixes: 655592586555875865559934
Test: Settings robotest and 34768986

6 years agoLog smart settings suggestion enabled/disabled state for A/B experiments
Soroosh Mariooryad [Fri, 11 Aug 2017 07:04:37 +0000 (00:04 -0700)]
Log smart settings suggestion enabled/disabled state for A/B experiments

Test: RunSettingsRoboTests
Bug: 64121058

Change-Id: Iadfa575b9a21caecb515b9975d388ee0d0480c11

6 years agoMerge "Remove outdated storage search results." into oc-mr1-dev
Daniel Nishi [Thu, 14 Sep 2017 17:43:40 +0000 (17:43 +0000)]
Merge "Remove outdated storage search results." into oc-mr1-dev

6 years agoMerge "Close the load screen faster on pre-quota devices." into oc-mr1-dev
Daniel Nishi [Thu, 14 Sep 2017 17:43:27 +0000 (17:43 +0000)]
Merge "Close the load screen faster on pre-quota devices." into oc-mr1-dev

6 years agoUpdate the bluetooth battery icon
jackqdyulei [Wed, 13 Sep 2017 20:35:02 +0000 (13:35 -0700)]
Update the bluetooth battery icon

In ag/2863892, we add a new parameter to tune the size of battery icon.
This cl use this parameter and update the icon in bluetooth detail page.

Bug: 65397557
Test: RunSettingsLibRoboTests & Screenshots
Change-Id: I6dd26f14b3209101dd39320b3720fbd4f79acf54