OSDN Git Service
Matthew Fritze [Tue, 5 Dec 2017 19:13:10 +0000 (11:13 -0800)]
Remove Slice getter from BasePreferenceController
After working through a prototype here: (ag/
3324435)
it is clear that we don't need the controller to
provider the slice. We will build an index that
will contain sufficent UI information, and a reference
to the controller.
At Slice Bind time, we can get the curret value from the
controller, and the UI information from the Index.
Bug:
67996923
Test: robotests
Change-Id: Id43a51bcd73051bc719cd5829907583e0edf23b2
TreeHugger Robot [Fri, 8 Dec 2017 00:51:19 +0000 (00:51 +0000)]
Merge "Depend settings on slices in the support library"
TreeHugger Robot [Fri, 8 Dec 2017 00:32:38 +0000 (00:32 +0000)]
Merge "Move codes generating html file from xml files to SettingsLib (1/2)"
Maggie Wang [Fri, 8 Dec 2017 00:00:08 +0000 (00:00 +0000)]
Merge "Send MODE_CHANGING broadcast before location mode change."
Stephen Li [Thu, 7 Dec 2017 23:56:30 +0000 (23:56 +0000)]
Manually merge changes from giant AOSP topic
Change-Id: Iec1a4fdf7f5e04f091608f148aa770cfcd5f8acc
Maggie [Thu, 30 Nov 2017 18:50:50 +0000 (10:50 -0800)]
Send MODE_CHANGING broadcast before location mode change.
When location mode is about to change in Settings app, send
MODE_CHANGING broadcast.
Fixes:
28057031
Test: manual
Test: robotests
Change-Id: I430941915daedf13e7b5d22dc8a6e37729d95b75
Beverly Tai [Thu, 7 Dec 2017 21:26:10 +0000 (21:26 +0000)]
Merge "Fix failure of ZenModeAutomaticRulesPreferenceControllerTest"
Beverly Tai [Thu, 7 Dec 2017 17:48:17 +0000 (17:48 +0000)]
Merge "Fix ZenModeScheduleRuleSettingsTest null pointer"
Beverly [Thu, 7 Dec 2017 15:04:20 +0000 (10:04 -0500)]
Fix ZenModeScheduleRuleSettingsTest null pointer
Test: make ROBOTEST_FILTER=ZenModeScheduleRuleSettingsTest RunSettingsRoboTests -j40
Bug:
63077372
Change-Id: Ib843337e5867507eec1236fb4504035c151c348c
Jaekyun Seok [Thu, 7 Dec 2017 10:46:41 +0000 (19:46 +0900)]
Fix failure of ZenModeAutomaticRulesPreferenceControllerTest
Running ZenModeAutomaticRulesPreferenceControllerTest fails due to
missing field "DEFAULT_RULE_IDS".
"mDefaultRuleIds" should be used instead of it.
Bug:
63077372
Test: make \
ROBOTEST_FILTER=ZenModeAutomaticRulesPreferenceControllerTest \
RunSettingsRoboTests
Change-Id: Ieb4a4304a0404685e4a50eb3a5c863a0132ebf7d
Xin Li [Thu, 7 Dec 2017 07:05:14 +0000 (07:05 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master am:
7b017d5a2f -s ours
am:
2ba6a22abb
Change-Id: Id5dd78948fe46817fdb0c65b2c4dc8d6536f3a37
Xin Li [Thu, 7 Dec 2017 04:36:38 +0000 (04:36 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master
am:
7b017d5a2f -s ours
Change-Id: I38ef4306a74fb9c1ca39903d5a74df5db0753290
Jeff Sharkey [Thu, 7 Dec 2017 03:09:59 +0000 (03:09 +0000)]
Merge "Guide user towards adoption when card is "empty"."
TreeHugger Robot [Wed, 6 Dec 2017 22:30:56 +0000 (22:30 +0000)]
Merge "Default DND rules show at top and can't be deleted"
Xin Li [Wed, 6 Dec 2017 19:52:09 +0000 (11:52 -0800)]
DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Iab7fd863c422780055277093cb9621197e09d969
Jeff Sharkey [Wed, 6 Dec 2017 22:22:18 +0000 (15:22 -0700)]
Guide user towards adoption when card is "empty".
When a newly inserted SD card is empty, we'd like to guide the user
towards adopting it. Similarly, if the card contains personal media
like photos, we'd like to guide the user towards using it as portable
storage.
Do this by quickly hunting around on the card for files under various
well-known directories. Special logic to ignore bundled "helper"
apps included from the SD card factory.
Test: bit FrameworksCoreTests:android.os.EnvironmentTest
Bug:
69128181
Exempt-From-Owner-Approval: I wrote the original code.
Change-Id: I48323156dd4c3bb125fc9e66e17cc0384fe9c30c
Jaekyun Seok [Thu, 30 Nov 2017 09:10:34 +0000 (18:10 +0900)]
Move codes generating html file from xml files to SettingsLib (1/2)
LicenseHtmlGeneratorFromXml, LicenseHtmlLoader and indirecly AsyncLoader
shoud be commonly used by Settings and TvSettings.
So this CL will move them to SettingsLib.
Test: building succeeded and tested on sailfish.
make ROBOTEST_FILTER=SettingsLicenseActivityTest RunSettingsRoboTests
Change-Id: I12e9169b1d3d313a6c5da0d575a6526327268381
Beverly [Tue, 5 Dec 2017 20:50:26 +0000 (15:50 -0500)]
Default DND rules show at top and can't be deleted
Test: make ROBOTEST_FILTER=ZenModeAutomaticRulesPreferenceControllerTest RunSettingsRoboTests -j40
Bug:
63077372
Change-Id: I43e7e2a70df5defe931a7ecedc6f946853dab476
Antony Sargent [Wed, 6 Dec 2017 19:39:56 +0000 (19:39 +0000)]
Merge "Revert "Update style names due to theme migration""
Antony Sargent [Wed, 6 Dec 2017 17:42:50 +0000 (17:42 +0000)]
Revert "Update style names due to theme migration"
This reverts commit
cc16feb726e76adeb18ca0ea6e841154b05815ec.
Reason for revert: in b/
70031670 we discovered some problems in
the support library side change (ag/
3136307), and it will take a
little while to fix those problems so we need to temporarily
revert the support library changes to unblock a push of the
support library to google3.
Change-Id: I2086f434d5bcb518e474734b6d2b98a4b1c194d2
Phil Weaver [Wed, 6 Dec 2017 17:38:58 +0000 (17:38 +0000)]
Merge "Settings enable a11y shortcut framework features"
TreeHugger Robot [Wed, 6 Dec 2017 17:03:40 +0000 (17:03 +0000)]
Merge "Don't override expand count when page is opened from search"
Matthew Fritze [Tue, 5 Dec 2017 18:46:47 +0000 (10:46 -0800)]
Depend settings on slices in the support library
Test: make
Bug:
67996923
Change-Id: Ifcb544424df27f3faa8872e6266de286cc706d59
Beverly [Mon, 20 Nov 2017 22:33:01 +0000 (17:33 -0500)]
Updates to automatic rule pages in Settings
- Re-added metrics for zen behavior preference controllers
- Dialogs in zen mode settings are rotate-friendly
- Automatic rules are refreshed on update state
- User-created (and default) automatic rules are always priority only and user cannot change this
- Automatic rules redesigned to have headers
Test: make ROBOTEST_FILTER=ZenModeAutomaticRulesPreferenceControllerTest RunSettingsRoboTests -j40
Bug:
63077372
Fixes:
68324465
Fixes:
69057696
Change-Id: I163acef2715dd4e60bfc08207f0e22352c4c0e28
TreeHugger Robot [Wed, 6 Dec 2017 02:45:15 +0000 (02:45 +0000)]
Merge "Rename SDK_VERSION_O to SDK_VERSION"
TreeHugger Robot [Wed, 6 Dec 2017 02:18:03 +0000 (02:18 +0000)]
Merge changes from topic "screen_lock_settings_log"
* changes:
Remove broken tests
Log screen lock settings using its own constant
jeffreyhuang [Tue, 5 Dec 2017 22:38:06 +0000 (14:38 -0800)]
Rename SDK_VERSION_O to SDK_VERSION
Test: make RunSettingsRoboTests -j40
Change-Id: I6715062d8addadda441e32809db1af55f15e3a90
TreeHugger Robot [Wed, 6 Dec 2017 00:22:06 +0000 (00:22 +0000)]
Merge "Fix broken test in sdk 26"
Antony Sargent [Tue, 5 Dec 2017 23:31:00 +0000 (23:31 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85 am:
acacd658f1 am:
db6e747ab9 am:
26e5f828f7 am:
fe20f69e3f am:
51950965e9
am:
5f4e32ae5f
Change-Id: Ie2d2b7d7479fcc2148476ff7a122c8f17a4d1f56
Fan Zhang [Tue, 5 Dec 2017 23:29:42 +0000 (15:29 -0800)]
Don't override expand count when page is opened from search
Change-Id: Ie1afcbc5f87793a4e07ec851f7c1cd205e9d67d2
Fixes:
70235975
Test: robotests
Antony Sargent [Tue, 5 Dec 2017 23:23:05 +0000 (23:23 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85 am:
acacd658f1 am:
db6e747ab9 am:
26e5f828f7 am:
fe20f69e3f
am:
51950965e9
Change-Id: I30014b81a3eb514caf030ea5efb72694f434e305
Antony Sargent [Tue, 5 Dec 2017 23:17:11 +0000 (23:17 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85 am:
acacd658f1 am:
db6e747ab9 am:
26e5f828f7
am:
fe20f69e3f
Change-Id: I1d1eb74920d9b191bb7f0365620d0dd1d372b923
Phil Weaver [Sat, 2 Dec 2017 02:12:44 +0000 (18:12 -0800)]
Settings enable a11y shortcut framework features
Bug:
34621067
Test: Settings->Accessibility->Volume key shortcut
dialog now shows color inversion and color correction,
and selecting them works.
Change-Id: If7b4f55bd39fbd4c00b1ad95c6568a77e23c4e7e
Antony Sargent [Tue, 5 Dec 2017 23:10:05 +0000 (23:10 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85 am:
acacd658f1 am:
db6e747ab9
am:
26e5f828f7
Change-Id: Ia88d8014f221c5079ff33f9a10e58c2eed7b329a
jeffreyhuang [Tue, 5 Dec 2017 22:08:13 +0000 (14:08 -0800)]
Fix broken test in sdk 26
- Create a new shadow because ImsManager is no longer hidden in sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I9f21bd3a9e0c08d1f2302dcff8fe2f6ebb256de2
TreeHugger Robot [Tue, 5 Dec 2017 22:53:42 +0000 (22:53 +0000)]
Merge "Add feature flag for battery settings page."
TreeHugger Robot [Tue, 5 Dec 2017 22:53:21 +0000 (22:53 +0000)]
Merge "Add XML attribute to toggle on/off LocationModePreferenceController."
Fan Zhang [Tue, 5 Dec 2017 22:36:47 +0000 (14:36 -0800)]
Remove broken tests
The test case is broken due to NoSuchField error from robolectric. Since
the code its testing is being deprecated, test can be removed to keep
build green.
Test: robotests
Change-Id: I22f8ea58fceeb85940447f70b10add877344ba05
Fan Zhang [Tue, 5 Dec 2017 21:46:56 +0000 (13:46 -0800)]
Log screen lock settings using its own constant
Bug:
32953042
Test: manual
Change-Id: Ic72a2b0e7d2a176e03f5e1f39e09b09430268e64
TreeHugger Robot [Tue, 5 Dec 2017 21:40:04 +0000 (21:40 +0000)]
Merge "Catch a rare NPE due in SuggestionController"
TreeHugger Robot [Tue, 5 Dec 2017 21:34:36 +0000 (21:34 +0000)]
Merge "Added footers to zen mode settings"
jackqdyulei [Mon, 27 Nov 2017 21:49:19 +0000 (13:49 -0800)]
Add feature flag for battery settings page.
Create PowerUsageSummaryLegacy and power_usage_summary_legacy, which
contains the old implementaion.
Bug:
69797586
Test: RunSettingsRoboTests
Change-Id: Icb9c25f06889462a6eedea48ae166043a6636848
Dianne Hackborn [Tue, 5 Dec 2017 20:12:08 +0000 (20:12 +0000)]
Merge "Update to support long version codes."
Ben Lin [Fri, 1 Dec 2017 23:14:39 +0000 (15:14 -0800)]
Add XML attribute to toggle on/off LocationModePreferenceController.
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=LocationModePreferenceControllerTest all pass.
Bug:
62378711
Change-Id: I0d054171b80b5677dba2a7a02fb076660ed5cc0d
TreeHugger Robot [Tue, 5 Dec 2017 19:50:15 +0000 (19:50 +0000)]
Merge "Move away from deprecated FakeFeatureFactory.setupForTest()"
Beverly [Fri, 17 Nov 2017 21:29:30 +0000 (16:29 -0500)]
Added footers to zen mode settings
ZenModeSettings Footer displays when DND will end
ZenModeBehaviorSettings Footer describes why dnd behavior cannot be changed when
in alarms only or total silence mode
Test: make RunSettingsRoboTests -j40
Bug:
63077372
Change-Id: Iefbb3995da4af2b210c8e0c3c3a798d3c613e275
Fan Zhang [Tue, 5 Dec 2017 18:36:08 +0000 (10:36 -0800)]
Catch a rare NPE due in SuggestionController
In monkey test, suggestion service can detach right before UI tries to query.
Change-Id: Ic2eeb81140f5b5d38688fbe92d20f68b9fa48c34
Fixes:
69979152
Test: monkey
Jeffrey Huang [Tue, 5 Dec 2017 18:34:27 +0000 (18:34 +0000)]
Merge "Display IMEI info when sim is removed"
Jeffrey Huang [Tue, 5 Dec 2017 18:34:05 +0000 (18:34 +0000)]
Merge "Default ICCID number to unavailable if no sim"
Fan Zhang [Mon, 4 Dec 2017 23:24:45 +0000 (15:24 -0800)]
Move away from deprecated FakeFeatureFactory.setupForTest()
Test: rerun
Change-Id: I896ba414315ddb1664c0499264f4992f0554ef98
Fan Zhang [Tue, 5 Dec 2017 17:38:42 +0000 (17:38 +0000)]
Merge "Hack to wait for both suggestion/category to load"
Antony Sargent [Tue, 5 Dec 2017 17:36:29 +0000 (17:36 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85 am:
acacd658f1
am:
db6e747ab9
Change-Id: Ibf7cb8c3c7947dbc8cbf019ab32b872756ed7c63
Antony Sargent [Tue, 5 Dec 2017 17:32:41 +0000 (17:32 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85
am:
acacd658f1
Change-Id: If9851b0b24c020d3a10b197fc15b6777bd88401c
Antony Sargent [Tue, 5 Dec 2017 17:28:54 +0000 (17:28 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407
am:
9867a3ef85
Change-Id: Ic9195106304da657092f113817ec7ad86618a2b1
Antony Sargent [Tue, 5 Dec 2017 17:26:51 +0000 (17:26 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207
am:
3d7dbd6407
Change-Id: Ifa4509bbabbb346ce581f17d33e3f48fc7014971
Antony Sargent [Tue, 5 Dec 2017 17:24:48 +0000 (17:24 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1
am:
24f063a207
Change-Id: I44b42f37a638cda455bbeb3ab4bab5c02fc9c7d9
Antony Sargent [Tue, 5 Dec 2017 17:21:14 +0000 (17:21 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846
am:
9cf1fc73f1
Change-Id: I4906dc8f97cfcfeef7bfda0896b39c032ef26ec6
Antony Sargent [Tue, 5 Dec 2017 17:19:12 +0000 (17:19 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3
am:
eee62e1846
Change-Id: Ie6fff7cf9df6827a29c04473ed3a0f1332c08ff2
Antony Sargent [Tue, 5 Dec 2017 17:17:08 +0000 (17:17 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383
am:
b2b401b5f3
Change-Id: I21921d41d35a87a48ad627e9889e4d00219e912b
Antony Sargent [Tue, 5 Dec 2017 17:13:36 +0000 (17:13 +0000)]
Reword bluetooth confirmation dialog
am:
e14d38a383
Change-Id: Ibb19504f6a74015a2a4d25d5c268db975da4ebb5
TreeHugger Robot [Tue, 5 Dec 2017 01:55:26 +0000 (01:55 +0000)]
Merge changes I9ef0979a,I241c5cea
* changes:
Move wifi test package to sdk 26
Create new ShadowBidiFormatter
Jordan Liu [Tue, 5 Dec 2017 00:56:27 +0000 (00:56 +0000)]
Merge "Hide signal strength when told by carrier" am:
9afa720abe am:
ed9508f3a6
am:
d2b04e92fe
Change-Id: Ie046e5290a3486f01f8cd41c61357b1dc7e418c0
Jordan Liu [Tue, 5 Dec 2017 00:27:13 +0000 (00:27 +0000)]
Merge "Hide signal strength when told by carrier" am:
9afa720abe
am:
ed9508f3a6
Change-Id: I43c22e7f6950adcf27a5b600a194927cbd06fb9b
jeffreyhuang [Mon, 4 Dec 2017 17:56:37 +0000 (09:56 -0800)]
Move wifi test package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I9ef0979a7c6c3647cedd48a2c6ab855928c1b57e
jeffreyhuang [Mon, 4 Dec 2017 23:15:20 +0000 (15:15 -0800)]
Create new ShadowBidiFormatter
- Use the new shadow to work around comparing spannable strings
Test: make RunSettingsRoboTests -j40
Change-Id: I241c5ceab98da2e57f6812a637e677f66fc01a8f
Jordan Liu [Mon, 4 Dec 2017 23:45:57 +0000 (23:45 +0000)]
Merge "Hide signal strength when told by carrier"
am:
9afa720abe
Change-Id: I64b6eece29d475d8fdbaf8f6d1fb2c62701fd6e4
Lei Yu [Mon, 4 Dec 2017 23:45:32 +0000 (23:45 +0000)]
Merge "Disable ConnectedDeviceConnectedActivity"
Jordan Liu [Mon, 4 Dec 2017 23:20:31 +0000 (23:20 +0000)]
Merge "Hide signal strength when told by carrier"
Fan Zhang [Mon, 4 Dec 2017 22:31:30 +0000 (14:31 -0800)]
Hack to wait for both suggestion/category to load
- This is unfortunately necessary to avoid a jank when category
load completes before suggestion load, in which case user has to
manually scroll up to see the suggestions.
- We could technically just add scrollTo(0), but that causes the list
scroll on its own within 0.5 second of settings start, and that's bad.
Change-Id: I8dc869a69a5bf11bbf7644b281cc1778dd1a90e8
Fixes:
69068691
Test: visual
Test: robotests
jeffreyhuang [Mon, 4 Dec 2017 22:42:09 +0000 (14:42 -0800)]
Default ICCID number to unavailable if no sim
Test: Manual
Change-Id: I22c69b5c40578a43f5edf01487e41b14e08ec35b
jeffreyhuang [Mon, 4 Dec 2017 22:33:58 +0000 (14:33 -0800)]
Display IMEI info when sim is removed
Change-Id: I9c6db4481e9b03c8984d350cd54722a3667b6c49
Fixes:
70165342
Test: make RunSettingsRoboTests -j40
Tony Mantler [Mon, 4 Dec 2017 22:30:54 +0000 (22:30 +0000)]
Merge "Remove proguard rules that are imported via aapt2"
TreeHugger Robot [Mon, 4 Dec 2017 22:11:00 +0000 (22:11 +0000)]
Merge changes from topic "advanced_bt_page"
* changes:
Add preference Received files
Add(copy) AdvancedConnectedDeviceDashboardFragment
TreeHugger Robot [Mon, 4 Dec 2017 22:06:36 +0000 (22:06 +0000)]
Merge changes Ia73a89d1,I78ee508d,I4aa035a4,I926eaa5f,I9389254b, ...
* changes:
Update cachedStorageValueHelperTest to sdk 26
Move AutoStorageManagementSwitchPrefCtrl to sdk 26
Update SecondaryUserControllerTest to sdk 26
Update StorageItemPrefCtrlTest to sdk 26
Update StorageSummaryDonutPrefCtrl test to sdk 26
Update UserProfileControllerTest to sdk 26
jackqdyulei [Fri, 1 Dec 2017 22:57:41 +0000 (14:57 -0800)]
Disable ConnectedDeviceConnectedActivity
Only one connected device activity could be enabled at one time. This
cl disbale the new version but keep old version enabled in
AndroidMainfest.xml.
In this case tile could find correct activity at any time.
Bug:
69810208
Test: Build
Change-Id: I0175b968cc26e38d0549fe2302b762fe0bc65c20
jackqdyulei [Thu, 30 Nov 2017 23:07:52 +0000 (15:07 -0800)]
Add preference Received files
Given that BluetoothFilesPreferenceController is already
exist, we could reuse this controller and only add
preference to xml.
Bug:
69333961
Test: Screenshot
Change-Id: I11285fd9a2b6c297dbf43a9a0b118c21780e6710
jackqdyulei [Wed, 29 Nov 2017 22:23:44 +0000 (14:23 -0800)]
Add(copy) AdvancedConnectedDeviceDashboardFragment
AdvancedConnectedDeviceDashboardFragment is the same as
ConnectedDeviceDashboardFagment except for:
1. Bt preference is not MasterSwitchPreference anymore.
2. New Bluetooth file preference.
This cl copies following files:
1. connected_devices_advanced(from *_old)
2. Advanced*Fragment(from *Old)
3. Advanced*Test(from old test)
Future cl will work on differences.
Bug:
69333961
Test: RunSettingsRoboTests
Change-Id: I4a7cb7225482fb8919af95bc5586e3bf0a80b1cb
jeffreyhuang [Mon, 4 Dec 2017 20:28:22 +0000 (12:28 -0800)]
Update cachedStorageValueHelperTest to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: Ia73a89d10727910545724f121ffc07ae306ec185
jeffreyhuang [Mon, 4 Dec 2017 20:26:56 +0000 (12:26 -0800)]
Move AutoStorageManagementSwitchPrefCtrl to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I78ee508de3b76d19dc801950ee3513a115d0c22b
jeffreyhuang [Mon, 4 Dec 2017 20:12:48 +0000 (12:12 -0800)]
Update SecondaryUserControllerTest to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I4aa035a46180ad791602200d066ffb8b06f25b93
jeffreyhuang [Mon, 4 Dec 2017 20:05:24 +0000 (12:05 -0800)]
Update StorageItemPrefCtrlTest to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I926eaa5f5355d166d770813939f7bcc6256d196e
jeffreyhuang [Mon, 4 Dec 2017 19:55:06 +0000 (11:55 -0800)]
Update StorageSummaryDonutPrefCtrl test to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I9389254b94452e3f23b964225445435f2384901d
jeffreyhuang [Mon, 4 Dec 2017 19:54:22 +0000 (11:54 -0800)]
Update UserProfileControllerTest to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: Ia0f654fd54e43b0fdba3077f7df178faaa314b3d
TreeHugger Robot [Mon, 4 Dec 2017 18:43:26 +0000 (18:43 +0000)]
Merge "Delete deprecated controller"
TreeHugger Robot [Sun, 3 Dec 2017 16:24:46 +0000 (16:24 +0000)]
Merge "ZenPreferences observe zen changes from USER_ALL"
Chien-Yu Chen [Sun, 3 Dec 2017 03:44:11 +0000 (03:44 +0000)]
Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev am:
fa3af7b0e7
am:
890c9a7ad3 -s ours
Change-Id: I61fcbf171ab4e6e9a251a1c312ccbfa0f9c9cc83
Chien-Yu Chen [Sun, 3 Dec 2017 03:43:36 +0000 (03:43 +0000)]
Revert "Revert "Settings: Enable HAL HDR+ by default"" am:
24721e7d96
am:
c8d91c6066 -s ours
Change-Id: Id22341f5c7beb7112bf1fe378a4bd09ba47d3d81
Chien-Yu Chen [Sun, 3 Dec 2017 03:28:40 +0000 (03:28 +0000)]
Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev
am:
fa3af7b0e7
Change-Id: I67347d636270ab4995dcb315c0adc0f67bf82795
Chien-Yu Chen [Sun, 3 Dec 2017 03:28:03 +0000 (03:28 +0000)]
Revert "Revert "Settings: Enable HAL HDR+ by default""
am:
24721e7d96
Change-Id: Iec2832d2ae85edb92576af5688a067b88528fb1a
TreeHugger Robot [Sun, 3 Dec 2017 03:20:19 +0000 (03:20 +0000)]
Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev
* changes:
Settings: Remove HAL HDR+ option
Revert "Revert "Settings: Enable HAL HDR+ by default""
TreeHugger Robot [Sat, 2 Dec 2017 03:12:50 +0000 (03:12 +0000)]
Merge "Add controllers for default app shortcut preferences."
TreeHugger Robot [Sat, 2 Dec 2017 02:37:20 +0000 (02:37 +0000)]
Merge "Move suggestions test package to sdk 26"
TreeHugger Robot [Sat, 2 Dec 2017 01:59:26 +0000 (01:59 +0000)]
Merge "Update WebViewAppPickerTest to sdk 26"
TreeHugger Robot [Sat, 2 Dec 2017 01:47:31 +0000 (01:47 +0000)]
Merge "move tests to sdk 26"
TreeHugger Robot [Sat, 2 Dec 2017 01:32:49 +0000 (01:32 +0000)]
Merge changes I8ce427ea,If33c3d3a,I579be569,I755c04da
* changes:
move search test package to sdk 26
Update accessibilityserviceresult test to sdk 26
Update IntentSearchViewHolderTest to sdk 26
fix DatabaseIndexingManagerTest hanging in tests
TreeHugger Robot [Sat, 2 Dec 2017 01:30:28 +0000 (01:30 +0000)]
Merge "Fix crash for AirplaneModePreferenceController when not available."
Doris Ling [Thu, 30 Nov 2017 23:45:25 +0000 (15:45 -0800)]
Add controllers for default app shortcut preferences.
For AppInfoDashboardFragment:
- add the default app shortcut preferences into the preference screen
instead of creating them dynamically.
- add controller for each of the shortcut preference.
Bug:
69384089
Test: make RunSettingsRoboTests
Change-Id: I1e81944a3bc867fd6a3a0d484bab77c3ad0e6441
TreeHugger Robot [Sat, 2 Dec 2017 01:15:40 +0000 (01:15 +0000)]
Merge "move survey and system test package to sdk 26"
TreeHugger Robot [Sat, 2 Dec 2017 00:35:25 +0000 (00:35 +0000)]
Merge changes Icc02469b,I506edc8a
* changes:
move security test package to sdk 26
Update OwnerInfoPrefCtrlTest to sdk 26
TreeHugger Robot [Sat, 2 Dec 2017 00:29:52 +0000 (00:29 +0000)]
Merge "move support test package to sdk 26"
OSDN Git Service
