OSDN Git Service
Tony Mantler [Tue, 3 Oct 2017 22:45:06 +0000 (15:45 -0700)]
Move SerialNumberPreferenceController to SettingsLib
Bug:
67410808
Test: RunSettingsRoboTests
Change-Id: If7fefed1f012521293769eadf5d6485c12b98956
TreeHugger Robot [Tue, 3 Oct 2017 20:21:46 +0000 (20:21 +0000)]
Merge "Make WifiTracker lifecycle aware"
Soroosh Mariooryad [Tue, 3 Oct 2017 18:38:27 +0000 (18:38 +0000)]
Merge "Fix ANR issue caused by sharedpref commit() on suggestion event logging" into oc-mr1-dev am:
0193e69597
am:
73679c124f
Change-Id: I25949dd1c2bdf31ec07cd3b963ac6b693cf3a0e4
Soroosh Mariooryad [Tue, 3 Oct 2017 18:36:05 +0000 (18:36 +0000)]
Merge "Fix ANR issue caused by sharedpref commit() on suggestion event logging" into oc-mr1-dev
am:
0193e69597
Change-Id: I5c65bd4965fa66150b3537e7654834630340ed5f
TreeHugger Robot [Tue, 3 Oct 2017 18:31:56 +0000 (18:31 +0000)]
Merge "Fix ANR issue caused by sharedpref commit() on suggestion event logging" into oc-mr1-dev
Jeffrey Huang [Tue, 3 Oct 2017 16:48:56 +0000 (16:48 +0000)]
Merge "Introduce ClearAdbKeysPreferenceController"
Jeffrey Huang [Tue, 3 Oct 2017 16:48:20 +0000 (16:48 +0000)]
Merge "Introduce ResizableActivityPreferenceController"
Jeffrey Huang [Tue, 3 Oct 2017 16:47:48 +0000 (16:47 +0000)]
Merge "Introduce NotificationChannelWarningsPrefCtrl"
TreeHugger Robot [Tue, 3 Oct 2017 00:30:35 +0000 (00:30 +0000)]
Merge "Return false if can't find package info"
jeffreyhuang [Mon, 2 Oct 2017 22:54:56 +0000 (15:54 -0700)]
Introduce ClearAdbKeysPreferenceController
- Create new ClearAdbKeysPreferenceController
- Added ClearAdbKeysWarningDialog
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ia12bfee753f2c9222e6d833b1fb7e099f3602fdf
Jeffrey Huang [Mon, 2 Oct 2017 22:59:04 +0000 (22:59 +0000)]
Merge "Introduce BugReportInPowerPreferenceControllerV2"
Fan Zhang [Mon, 2 Oct 2017 22:21:33 +0000 (15:21 -0700)]
Return false if can't find package info
Change-Id: Iaf667e0977f60abcbf3eb76c46c46f591c00123e
Fixes:
66981347
Test: robotests
Eric Schwarzenbach [Mon, 2 Oct 2017 21:57:21 +0000 (21:57 +0000)]
Merge "Fix "Add Network" button on SavedAccessPoints page."
TreeHugger Robot [Mon, 2 Oct 2017 21:46:35 +0000 (21:46 +0000)]
Merge "Make robotest less flaky"
jeffreyhuang [Mon, 2 Oct 2017 20:03:34 +0000 (13:03 -0700)]
Introduce ResizableActivityPreferenceController
- Create new ResizableActivityPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I401db1fe3a051ee70ab9afe2bf8c377b3b0b4e2f
jeffreyhuang [Mon, 2 Oct 2017 19:46:39 +0000 (12:46 -0700)]
Introduce NotificationChannelWarningsPrefCtrl
- Create new NotificationChannelWarningsPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I232b24ee0505eae254bd1d43b7d91ab8860285e2
Jeffrey Huang [Mon, 2 Oct 2017 20:54:53 +0000 (20:54 +0000)]
Merge "Introduce VerifyAppsOverUsbPreferenceControllerV2"
Jeffrey Huang [Mon, 2 Oct 2017 20:53:52 +0000 (20:53 +0000)]
Merge "Introduce AllowAppsOnExternalPreferenceController"
Fan Zhang [Mon, 2 Oct 2017 20:10:08 +0000 (13:10 -0700)]
Make robotest less flaky
Change-Id: Ic9ed1ccbb7b7f802b6a5cf915aeb96c799007a7d
Fixes:
67307841
Test: rerun robotest
Bill Yi [Mon, 2 Oct 2017 19:22:06 +0000 (19:22 +0000)]
Import translations. DO NOT MERGE am:
6fe50e7224 -s ours
am:
2032410de4 -s ours
Change-Id: Idba6ac65fea909285d64e6fe2f883d3e80e6b8c2
jeffreyhuang [Mon, 2 Oct 2017 17:12:06 +0000 (10:12 -0700)]
Introduce BugReportInPowerPreferenceControllerV2
- Create new BugReportInPowerPreferenceControllerV2
- Deprecate BugReportInPowerPreferenceController
- Create controller inside the DashboardFragment
- Copy logic from BugReportInPowerPreferenceController with
slight modifications for dashboard fragment compatibility
Bug:
34203528
Test: make RunSettingsRoboTests -j40# Please enter the commit message for your changes. Lines starting
Change-Id: I8ec0c84fa9c4e59aca48586cc081822d78d8c0d5
Bill Yi [Mon, 2 Oct 2017 19:09:02 +0000 (19:09 +0000)]
Import translations. DO NOT MERGE
am:
6fe50e7224 -s ours
Change-Id: I2ac5d233d10ca35a6d8ed24b29f8eb05fe4bba9c
Carsten Hauge [Mon, 2 Oct 2017 18:53:32 +0000 (18:53 +0000)]
Merge "Avoid NullPointerException when updating preference intents" am:
c4b0fa5858 am:
f38ed428dc am:
5d2919907b
am:
143b31959b
Change-Id: I9f2b3769658200c332a38a943f2bc1331bdae3f9
Jeffrey Huang [Mon, 2 Oct 2017 18:16:51 +0000 (18:16 +0000)]
Merge "Introduce AppsNotRespondingPreferenceController"
Jeffrey Huang [Mon, 2 Oct 2017 18:16:25 +0000 (18:16 +0000)]
Merge "Introduce KeepActivitiesPreferenceController"
Jeffrey Huang [Mon, 2 Oct 2017 18:16:14 +0000 (18:16 +0000)]
Merge "Introduce UsbAudioRoutingPreferenceController"
Jeffrey Huang [Mon, 2 Oct 2017 18:16:03 +0000 (18:16 +0000)]
Merge "Introduce HardwareOverlaysPreferenceController"
Jeffrey Huang [Mon, 2 Oct 2017 18:15:47 +0000 (18:15 +0000)]
Merge "Introduce GpuViewUpdatesPreferenceController"
Jeffrey Huang [Mon, 2 Oct 2017 18:15:34 +0000 (18:15 +0000)]
Merge "Introduce ShowLayoutBoundsPreferenceController"
Carsten Hauge [Mon, 2 Oct 2017 18:10:49 +0000 (18:10 +0000)]
Merge "Avoid NullPointerException when updating preference intents" am:
c4b0fa5858 am:
f38ed428dc
am:
5d2919907b
Change-Id: I542ba13fe05f1027e0199c2a57ade93c6dd0bccb
Carsten Hauge [Mon, 2 Oct 2017 18:06:32 +0000 (18:06 +0000)]
Merge "Avoid NullPointerException when updating preference intents" am:
c4b0fa5858
am:
f38ed428dc
Change-Id: I3fcc041677b4d739952902076184a8fa1dd73dad
Carsten Hauge [Mon, 2 Oct 2017 18:03:40 +0000 (18:03 +0000)]
Merge "Avoid NullPointerException when updating preference intents"
am:
c4b0fa5858
Change-Id: I403d380ebfbbb0c70fdf5b6c9ff51267a5163e6f
Treehugger Robot [Mon, 2 Oct 2017 17:56:02 +0000 (17:56 +0000)]
Merge "Avoid NullPointerException when updating preference intents"
Bill Yi [Mon, 2 Oct 2017 15:23:49 +0000 (08:23 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ib580d3bc9d6b979d5da92cc4ef3f207acdfaa48e
Bill Yi [Mon, 2 Oct 2017 15:12:09 +0000 (08:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3be6845a3c0c062387defa8349461b08be25df7f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Carsten Hauge [Mon, 7 Jul 2014 07:36:07 +0000 (09:36 +0200)]
Avoid NullPointerException when updating preference intents
Comparisons changed on the intent action. Sometimes an account
preference intent does not have an action specified.
Fixes:
67075850
Test: manual - go to Settings > Users & accounts and tap an account.
Change-Id: I54cebbc983b55aa1487a122d37ccd5c79bbf519d
jeffreyhuang [Sat, 30 Sep 2017 00:28:33 +0000 (17:28 -0700)]
Introduce VerifyAppsOverUsbPreferenceControllerV2
- Create new VerifyAppsOverUsbPreferenceControllerV2
- Deprecate VerifyAppsOverUsbPreferenceController
- Create controller inside the DashboardFragment
- Copy logic from VerifyAppsOverUsbPreferenceController with
slight modifications for dashboard fragment compatibility
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I37c01cd262c9e12307ec9cbe6effc5470496550f
TreeHugger Robot [Sat, 30 Sep 2017 00:43:39 +0000 (00:43 +0000)]
Merge "Create suggestion state provider."
jeffreyhuang [Fri, 29 Sep 2017 23:27:56 +0000 (16:27 -0700)]
Introduce AllowAppsOnExternalPreferenceController
- Create new AllowAppsOnExternalPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ia8f1be0509f87ad42cf3dc640fa711cdec07698d
jeffreyhuang [Fri, 29 Sep 2017 23:10:13 +0000 (16:10 -0700)]
Introduce AppsNotRespondingPreferenceController
- Create new AppsNotRespondingPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I9cf9a19b59bf21d6aa0205377025f82ed21b7e51
jeffreyhuang [Fri, 29 Sep 2017 00:59:55 +0000 (17:59 -0700)]
Introduce UsbAudioRoutingPreferenceController
- Create new UsbAudioRoutingPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ie806d509e3df4515cccbaf56c259ae55c3e2ab61
jeffreyhuang [Thu, 28 Sep 2017 23:49:53 +0000 (16:49 -0700)]
Introduce HardwareOverlaysPreferenceController
- Create new HardwareOverlaysPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
- Added ShadowParcel to help with testing
HardwareOverlaysPreferenceController and
ShowSurfaceUpdatesPreferenceController
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ib6b9679f2a2d2ec84f91da5ac0b68cb2b21eea72
jeffreyhuang [Thu, 28 Sep 2017 22:02:13 +0000 (15:02 -0700)]
Introduce GpuViewUpdatesPreferenceController
- Create new GpuViewUpdatesPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
- Fix a typo in preference naming
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ieff20634238900137acc1524edb6fd0d4bfce894
jeffreyhuang [Wed, 27 Sep 2017 22:55:49 +0000 (15:55 -0700)]
Introduce ShowLayoutBoundsPreferenceController
- Create new ShowLayoutBoundsPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ie7bb26675f4dcedbff9607a2c4e4f5bee0343463
Fan Zhang [Thu, 28 Sep 2017 00:32:46 +0000 (17:32 -0700)]
Create suggestion state provider.
- The provider now handles isSuggestionComplete check
- Remove SuggestionChecks class.
Bug:
65065268
Test: robotests
Change-Id: Id45d67d4a5146cc023f7fad7bb292b4c1c14a782
Jeffrey Huang [Fri, 29 Sep 2017 22:35:55 +0000 (22:35 +0000)]
Merge "Introduce StrictModePreferenceController"
TreeHugger Robot [Fri, 29 Sep 2017 20:54:59 +0000 (20:54 +0000)]
Merge "Move code from SuggestionChecks to FeatureProvider"
Jeffrey Huang [Fri, 29 Sep 2017 20:50:36 +0000 (20:50 +0000)]
Merge "Introduce ForceMsaaPreferenceController"
Jeffrey Huang [Fri, 29 Sep 2017 20:50:05 +0000 (20:50 +0000)]
Merge "Introduce HardwareLayersUpdatesPreferenceCtrl"
Jeffrey Huang [Fri, 29 Sep 2017 20:49:46 +0000 (20:49 +0000)]
Merge "Introduce ForceGpuRenderingPreferenceController"
Jeffrey Huang [Fri, 29 Sep 2017 20:49:19 +0000 (20:49 +0000)]
Merge "Introduce RtlLayoutPreferenceController"
Jeffrey Huang [Fri, 29 Sep 2017 20:48:57 +0000 (20:48 +0000)]
Merge "Fix a bug in show surface updates"
jeffreyhuang [Fri, 29 Sep 2017 18:27:33 +0000 (11:27 -0700)]
Introduce StrictModePreferenceController
- Create new StrictModePreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I28d70fd5c82de2427747625b5f06f79d3808a145
jeffreyhuang [Fri, 29 Sep 2017 20:43:52 +0000 (13:43 -0700)]
Introduce KeepActivitiesPreferenceController
- Create new KeepActivitiesPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I9e15d285eee51164dd5c3a07c4f2069bf4d73383
songkailun [Fri, 29 Sep 2017 19:59:16 +0000 (19:59 +0000)]
Merge "Fix wrong format in AndroidManifest.xml" am:
de795d12d1 am:
39ddac51b6 am:
109d0bafd4
am:
806af289e8
Change-Id: I5ff0ee96f36cc1ab72333879fa92a798bf63a2be
songkailun [Fri, 29 Sep 2017 19:04:56 +0000 (19:04 +0000)]
Merge "Fix wrong format in AndroidManifest.xml" am:
de795d12d1 am:
39ddac51b6
am:
109d0bafd4
Change-Id: I8aa124be1d911d0fd72df1596436514231cc6fd6
Fan Zhang [Fri, 29 Sep 2017 00:17:44 +0000 (17:17 -0700)]
Move code from SuggestionChecks to FeatureProvider
This is step one to deprecate SuggestionChecks. Moving logic into
SuggestionFeatureProvider allows potential logic override and improves
testability.
Also moved isSuggestionComplete tests to corresponding activity/pref
controller test.
Bug:
65065268
Test: robotests
Change-Id: I2071d30fc58bb84acad2083ca03cfcf7d41f10cb
Tony Mantler [Thu, 28 Sep 2017 22:03:35 +0000 (15:03 -0700)]
Make WifiTracker lifecycle aware
Bug:
66953027
Test: m -j checkbuild
Change-Id: I004c889b887a67614a5e0b6ae62fdbf8d6070ebd
jeffreyhuang [Fri, 29 Sep 2017 01:08:47 +0000 (18:08 -0700)]
Fix a bug in show surface updates
- fix a bug that caused the master switch to unintentionally turn on
the show surface updates preference
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I307a801aa1a7c1606b3f5d55a0d1f2dbf1d60416
jeffreyhuang [Thu, 28 Sep 2017 22:24:52 +0000 (15:24 -0700)]
Introduce ForceMsaaPreferenceController
- Create new ForceMsaaPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I5d336037a6ae5904d0459fe56b311fac8372be86
jeffreyhuang [Wed, 27 Sep 2017 22:33:41 +0000 (15:33 -0700)]
Introduce RtlLayoutPreferenceController
- Create new RtlLayoutPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ieefd8dc97b0e1f781d97aca781bba0243c3875b9
jeffreyhuang [Thu, 28 Sep 2017 21:44:15 +0000 (14:44 -0700)]
Introduce HardwareLayersUpdatesPreferenceCtrl
- Create new HardwareLayersUpdatesPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
- Fix a typo in preference naming
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I12744051c836b17ca2bfca5a84b9e22eb7b7d677
jeffreyhuang [Thu, 28 Sep 2017 21:16:02 +0000 (14:16 -0700)]
Introduce ForceGpuRenderingPreferenceController
- Create new ForceGpuRenderingPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ib3afb9278257f0c2b181e15f28650d9620538c17
Jeffrey Huang [Fri, 29 Sep 2017 16:46:37 +0000 (16:46 +0000)]
Merge "Optimize poking to happen in dashboard fragment"
TreeHugger Robot [Fri, 29 Sep 2017 15:30:33 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE"
songkailun [Fri, 29 Sep 2017 14:46:23 +0000 (14:46 +0000)]
Merge "Fix wrong format in AndroidManifest.xml" am:
de795d12d1
am:
39ddac51b6
Change-Id: Ife3991761d4fcbf5cecdb6745536f9ed99069a2e
songkailun [Fri, 29 Sep 2017 09:37:17 +0000 (09:37 +0000)]
Merge "Fix wrong format in AndroidManifest.xml"
am:
de795d12d1
Change-Id: I443534ac7e122e337102d41c4138a0e94be72f7f
Treehugger Robot [Fri, 29 Sep 2017 06:45:30 +0000 (06:45 +0000)]
Merge "Fix wrong format in AndroidManifest.xml"
songkailun [Fri, 29 Sep 2017 01:42:05 +0000 (09:42 +0800)]
Fix wrong format in AndroidManifest.xml
N/A
Change-Id: Idf3b9c22e65d15013f5e3e2f5a1e9719d35ede3a
Signed-off-by: songkailun <songkailun@xiaomi.com>
jeffreyhuang [Thu, 28 Sep 2017 22:54:50 +0000 (15:54 -0700)]
Optimize poking to happen in dashboard fragment
- Make sure that poking happens only once in
onDeveloperOptionsDisabled()
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I2a47f34ab17bf57ac4dabc7b0e67b42cc0b120b7
jeffreyhuang [Thu, 28 Sep 2017 23:00:59 +0000 (16:00 -0700)]
isAvailable is true by default in dev options
- isAvailable() is defaulted to return true for all developer options
preferences
- child controllers should override for custom hiding logic
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I89921f801c25e74bf78d02c55b5f34cf1d464cd0
Jeffrey Huang [Thu, 28 Sep 2017 22:46:35 +0000 (22:46 +0000)]
Merge "Introduce ShowSurfaceUpdatesPreferenceController"
Eric Schwarzenbach [Wed, 20 Sep 2017 23:34:23 +0000 (16:34 -0700)]
Fix "Add Network" button on SavedAccessPoints page.
Fix merge conflict.
The old onSubmit was a no-op. It now correctly pipes onSubmit to
WifiManager#save() with the new WifiConfiguration. On successful save,
it displays the new network in the list, and on failure, it displays a
toast indicating that the save action failed. Adds a test for the
WifiDialog behaviors on this page.
Bug:
66177765
Test: make RunSettingsRoboTests, manual - tested with Wifi enabled and
disabled, and with networks that were visible and not.
Change-Id: I27446aa49bc9efaf1ea1d6c6158928b62ce01ba2
Jeffrey Huang [Thu, 28 Sep 2017 21:35:35 +0000 (21:35 +0000)]
Merge "Introduce BluetoothInbandRingingPreferenceCtrl"
jeffreyhuang [Wed, 27 Sep 2017 21:55:46 +0000 (14:55 -0700)]
Introduce ShowSurfaceUpdatesPreferenceController
- Create new ShowSurfaceUpdatesPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I649549af1c5dd9d541bc9e6a62b4553fa7877233
Jeffrey Huang [Thu, 28 Sep 2017 20:28:57 +0000 (20:28 +0000)]
Merge "Fix a failing test in AdbPreferenceControllerTest"
jeffreyhuang [Thu, 28 Sep 2017 20:24:16 +0000 (13:24 -0700)]
Fix a failing test in AdbPreferenceControllerTest
- Mock out a problematic method
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ib12f1e852d27df705f5a13e73f29b0b6f4ab5ff6
Bill Yi [Thu, 28 Sep 2017 19:36:32 +0000 (19:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
d5b9fec389 -s ours
am:
532f150227 -s ours
Change-Id: Id4ea5c6c982f8ab27551513b422fd6570513b6d8
Bill Yi [Thu, 28 Sep 2017 19:33:32 +0000 (19:33 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
d5b9fec389 -s ours
Change-Id: Iec1b837215cf09e1904287f9eee0082fa4f00097
TreeHugger Robot [Thu, 28 Sep 2017 19:17:32 +0000 (19:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
jeffreyhuang [Tue, 26 Sep 2017 20:35:44 +0000 (13:35 -0700)]
Introduce BluetoothInbandRingingPreferenceCtrl
- Create new BluetoothInbandRingingPreferenceController
- Create controller inside the DashboardFragment
- Port logic from DevelopmentSettings into the controller
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I2551803b50323c93ce8f1595d5bbab92b7a18ed4
Jeffrey Huang [Thu, 28 Sep 2017 18:07:05 +0000 (18:07 +0000)]
Merge "Introduce PointerLocationPreferenceController"
Jeffrey Huang [Thu, 28 Sep 2017 18:06:37 +0000 (18:06 +0000)]
Merge "Introduce BluetoothAbsoluteVolumePreferenceCtrl"
Jeffrey Huang [Thu, 28 Sep 2017 18:05:11 +0000 (18:05 +0000)]
Merge "Introduce AdbPreferenceController"
TreeHugger Robot [Thu, 28 Sep 2017 17:43:04 +0000 (17:43 +0000)]
Merge "Refactor IndexData conversion flow"
Kevin Chyn [Thu, 28 Sep 2017 16:36:51 +0000 (16:36 +0000)]
Merge "Fix fingerprint grammar"
Bill Yi [Thu, 28 Sep 2017 02:51:32 +0000 (19:51 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: If92f24f85c26217b251503d846183f80da8b75ba
Bill Yi [Thu, 28 Sep 2017 02:39:53 +0000 (19:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0b4682a530cb8c8bf3727041463fd7afcc885048
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
jackqdyulei [Thu, 28 Sep 2017 02:18:59 +0000 (02:18 +0000)]
Merge "Hide summary for type system" into oc-mr1-dev am:
aadee0997c
am:
da9247d645
Change-Id: I440fcbfea0cf934e68737eb5314739e397d80d88
jackqdyulei [Thu, 28 Sep 2017 02:17:08 +0000 (02:17 +0000)]
Merge "Hide summary for type system" into oc-mr1-dev
am:
aadee0997c
Change-Id: I99a8cfefe4253ee223b91d2a3e0b9e7721e73ee4
TreeHugger Robot [Thu, 28 Sep 2017 02:11:54 +0000 (02:11 +0000)]
Merge "Hide summary for type system" into oc-mr1-dev
Doris Ling [Thu, 28 Sep 2017 02:07:04 +0000 (02:07 +0000)]
Merge "Move listening to brightness changes to onStart/onStop." into oc-mr1-dev am:
d52c4482e4
am:
eccb0fcff9
Change-Id: Ic62d580bad8d520e9a1ec942ab30c361df9e24aa
Doris Ling [Thu, 28 Sep 2017 02:05:10 +0000 (02:05 +0000)]
Merge "Move listening to brightness changes to onStart/onStop." into oc-mr1-dev
am:
d52c4482e4
Change-Id: I2206805a6b9dada11576a6e6667980585acc8472
TreeHugger Robot [Thu, 28 Sep 2017 01:58:47 +0000 (01:58 +0000)]
Merge "Move listening to brightness changes to onStart/onStop." into oc-mr1-dev
Kevin Chyn [Thu, 28 Sep 2017 01:52:17 +0000 (18:52 -0700)]
Fix fingerprint grammar
Fixes:
63121846
Test: manual test of fingerprint setup, string is updated
Change-Id: I5ac90da196639a01db1dc4bf765a671e248e492f
TreeHugger Robot [Wed, 27 Sep 2017 23:49:19 +0000 (23:49 +0000)]
Merge "Update Robolectric to 3.4.2"
Chien-Yu Chen [Wed, 27 Sep 2017 23:35:18 +0000 (23:35 +0000)]
Settings: Show HAL HDR+ option in user build am:
4d26fa03a8
am:
f0c328ed78
Change-Id: Ia14d7a5ada922d29816f8c9d2895f6141d86ff27
Chien-Yu Chen [Wed, 27 Sep 2017 23:33:01 +0000 (23:33 +0000)]
Settings: Show HAL HDR+ option in user build
am:
4d26fa03a8
Change-Id: I9b94c91b0a212ca727b9ba2ee7fc75902f2590e4
TreeHugger Robot [Wed, 27 Sep 2017 22:47:40 +0000 (22:47 +0000)]
Merge "Settings: Correctly align cursor in Settings"
TreeHugger Robot [Wed, 27 Sep 2017 22:45:27 +0000 (22:45 +0000)]
Merge "Settings: Show HAL HDR+ option in user build"