Commit Graph

41764 Commits

Author SHA1 Message Date
Maggie Wang
b44c5ac04a Merge "Send MODE_CHANGING broadcast before location mode change." 2017-12-08 00:00:08 +00:00
Stephen Li
5be4c0fdfd Manually merge changes from giant AOSP topic
Change-Id: Iec1a4fdf7f5e04f091608f148aa770cfcd5f8acc
2017-12-07 23:56:30 +00:00
Maggie
1949600132 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
2017-12-07 23:21:55 +00:00
Beverly Tai
347846c0e4 Merge "Fix failure of ZenModeAutomaticRulesPreferenceControllerTest" 2017-12-07 21:26:10 +00:00
Beverly Tai
13ea943d89 Merge "Fix ZenModeScheduleRuleSettingsTest null pointer" 2017-12-07 17:48:17 +00:00
Beverly
1aabe820e8 Fix ZenModeScheduleRuleSettingsTest null pointer
Test: make ROBOTEST_FILTER=ZenModeScheduleRuleSettingsTest RunSettingsRoboTests -j40
Bug: 63077372
Change-Id: Ib843337e5867507eec1236fb4504035c151c348c
2017-12-07 10:04:20 -05:00
Jaekyun Seok
b000ace0eb 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
2017-12-07 19:46:41 +09:00
Xin Li
82c94efa69 DO NOT MERGE: Merge Oreo MR1 into master am: 7b017d5a2f -s ours
am: 2ba6a22abb

Change-Id: Id5dd78948fe46817fdb0c65b2c4dc8d6536f3a37
2017-12-07 07:05:14 +00:00
Xin Li
2ba6a22abb DO NOT MERGE: Merge Oreo MR1 into master
am: 7b017d5a2f  -s ours

Change-Id: I38ef4306a74fb9c1ca39903d5a74df5db0753290
2017-12-07 04:36:38 +00:00
Jeff Sharkey
e677f49328 Merge "Guide user towards adoption when card is "empty"." 2017-12-07 03:09:59 +00:00
TreeHugger Robot
471044b58a Merge "Default DND rules show at top and can't be deleted" 2017-12-06 22:30:56 +00:00
Xin Li
7b017d5a2f DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Iab7fd863c422780055277093cb9621197e09d969
2017-12-06 14:24:54 -08:00
Jeff Sharkey
e7a9b8bb20 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
2017-12-06 15:22:42 -07:00
Beverly
2c5895d615 Default DND rules show at top and can't be deleted
Test: make ROBOTEST_FILTER=ZenModeAutomaticRulesPreferenceControllerTest RunSettingsRoboTests -j40
Bug: 63077372
Change-Id: I43e7e2a70df5defe931a7ecedc6f946853dab476
2017-12-06 14:53:09 -05:00
Antony Sargent
6b66cd3bda Merge "Revert "Update style names due to theme migration"" 2017-12-06 19:39:56 +00:00
Antony Sargent
49820f4c65 Revert "Update style names due to theme migration"
This reverts commit cc16feb726.

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
2017-12-06 17:57:01 +00:00
Phil Weaver
d7d5754cfd Merge "Settings enable a11y shortcut framework features" 2017-12-06 17:38:58 +00:00
TreeHugger Robot
3b3da56e6f Merge "Don't override expand count when page is opened from search" 2017-12-06 17:03:40 +00:00
Beverly
323522171d 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
2017-12-06 10:14:08 -05:00
TreeHugger Robot
91fff3093d Merge "Rename SDK_VERSION_O to SDK_VERSION" 2017-12-06 02:45:15 +00:00
TreeHugger Robot
37e4d92a09 Merge changes from topic "screen_lock_settings_log"
* changes:
  Remove broken tests
  Log screen lock settings using its own constant
2017-12-06 02:18:03 +00:00
jeffreyhuang
cbfb099a40 Rename SDK_VERSION_O to SDK_VERSION
Test: make RunSettingsRoboTests -j40
Change-Id: I6715062d8addadda441e32809db1af55f15e3a90
2017-12-05 16:43:54 -08:00
TreeHugger Robot
73ee3a6bf3 Merge "Fix broken test in sdk 26" 2017-12-06 00:22:06 +00:00
Antony Sargent
508190bb9f 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
2017-12-05 23:31:00 +00:00
Fan Zhang
3b5f3885cd Don't override expand count when page is opened from search
Change-Id: Ie1afcbc5f87793a4e07ec851f7c1cd205e9d67d2
Fixes: 70235975
Test: robotests
2017-12-05 15:29:42 -08:00
Antony Sargent
5f4e32ae5f 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
2017-12-05 23:23:05 +00:00
Antony Sargent
51950965e9 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
2017-12-05 23:17:11 +00:00
Phil Weaver
b9cf0d2a4f 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
2017-12-05 15:14:11 -08:00
Antony Sargent
fe20f69e3f 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
2017-12-05 23:10:05 +00:00
jeffreyhuang
b9770d6637 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
2017-12-05 15:01:59 -08:00
TreeHugger Robot
2f95595d02 Merge "Add feature flag for battery settings page." 2017-12-05 22:53:42 +00:00
TreeHugger Robot
ac301bb5e5 Merge "Add XML attribute to toggle on/off LocationModePreferenceController." 2017-12-05 22:53:21 +00:00
Fan Zhang
0503686b37 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
2017-12-05 14:36:47 -08:00
Fan Zhang
ca2e54be59 Log screen lock settings using its own constant
Bug: 32953042
Test: manual
Change-Id: Ic72a2b0e7d2a176e03f5e1f39e09b09430268e64
2017-12-05 14:16:09 -08:00
TreeHugger Robot
fa650398f7 Merge "Catch a rare NPE due in SuggestionController" 2017-12-05 21:40:04 +00:00
TreeHugger Robot
f949df10b5 Merge "Added footers to zen mode settings" 2017-12-05 21:34:36 +00:00
jackqdyulei
166102c3c0 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
2017-12-05 13:15:13 -08:00
Dianne Hackborn
82789a1f39 Merge "Update to support long version codes." 2017-12-05 20:12:08 +00:00
Ben Lin
607cd20a16 Add XML attribute to toggle on/off LocationModePreferenceController.
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=LocationModePreferenceControllerTest all pass.
Bug: 62378711

Change-Id: I0d054171b80b5677dba2a7a02fb076660ed5cc0d
2017-12-05 11:56:00 -08:00
TreeHugger Robot
2b081bceb4 Merge "Move away from deprecated FakeFeatureFactory.setupForTest()" 2017-12-05 19:50:15 +00:00
Beverly
b7b74226c3 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
2017-12-05 14:35:31 -05:00
Fan Zhang
5f3716d1de 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
2017-12-05 10:36:08 -08:00
Jeffrey Huang
cad68b3cfa Merge "Display IMEI info when sim is removed" 2017-12-05 18:34:27 +00:00
Jeffrey Huang
d42f19e016 Merge "Default ICCID number to unavailable if no sim" 2017-12-05 18:34:05 +00:00
Fan Zhang
dff6dd687e Move away from deprecated FakeFeatureFactory.setupForTest()
Test: rerun
Change-Id: I896ba414315ddb1664c0499264f4992f0554ef98
2017-12-05 10:12:10 -08:00
Fan Zhang
caf5358e40 Merge "Hack to wait for both suggestion/category to load" 2017-12-05 17:38:42 +00:00
Antony Sargent
26e5f828f7 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
2017-12-05 17:36:29 +00:00
Antony Sargent
db6e747ab9 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85
am: acacd658f1

Change-Id: If9851b0b24c020d3a10b197fc15b6777bd88401c
2017-12-05 17:32:41 +00:00
Antony Sargent
acacd658f1 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407
am: 9867a3ef85

Change-Id: Ic9195106304da657092f113817ec7ad86618a2b1
2017-12-05 17:28:54 +00:00
Antony Sargent
9867a3ef85 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207
am: 3d7dbd6407

Change-Id: Ifa4509bbabbb346ce581f17d33e3f48fc7014971
2017-12-05 17:26:51 +00:00