Commit Graph

41789 Commits

Author SHA1 Message Date
jackqdyulei
1240549591 Move AppListGroup to PreferenceController
Move the app list in battery settings to PreferenceController. So that
we can:
1. Clean the code in PowerUsageSummary
2. Make it easy to add/move the app list to other place in furture.

This cl:
1. Move and make it invisible since in P we don't show app list in
battery main page.
2. Move related test to BatteryAppListPreferenceControllerTest

Bug: 70234293
Test: RunSettingsRoboTests
Change-Id: Ice7a42394916ff5e71305bfe22f5c35868d87fc7
2017-12-08 10:21:54 -08:00
Bill Yi
b8eb89579c Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 814fb3b7a1 -s ours
am: 9840c89235  -s ours

Change-Id: If1f0055b82b51ae304b5bacafa95821d8eaa2d07
2017-12-08 06:04:47 +00:00
Bill Yi
9840c89235 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 814fb3b7a1  -s ours

Change-Id: Ic4696096352546cb962ab57470ed569535791665
2017-12-08 06:01:46 +00:00
TreeHugger Robot
814fb3b7a1 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-12-08 05:52:37 +00:00
TreeHugger Robot
256f6fb607 Merge "Update feature flag dashboard UI to display all features" 2017-12-08 05:50:54 +00:00
Bill Yi
ec657fd6ae Import translations. DO NOT MERGE am: 3ed385256a -s ours am: 14c47203b3 -s ours
am: 5811075aeb  -s ours

Change-Id: I0ea16471b0fe4caa83f0b08907325e6771d19ac2
2017-12-08 05:46:46 +00:00
Bill Yi
5811075aeb Import translations. DO NOT MERGE am: 3ed385256a -s ours
am: 14c47203b3  -s ours

Change-Id: Ic512ba80a6900175986841430f1b69e170bbd845
2017-12-08 05:42:43 +00:00
Bill Yi
14c47203b3 Import translations. DO NOT MERGE
am: 3ed385256a  -s ours

Change-Id: Idb17affa2264a9b46343c3bc9dea1978e5a92a32
2017-12-08 05:39:41 +00:00
Fan Zhang
aeff0be6a5 Merge "Update asset for no search result image" into oc-mr1-dev am: afa1efabad
am: ed6805142f

Change-Id: I7fae2db9c207c26277fbbf04c63911ed222e5d0b
2017-12-08 03:35:59 +00:00
Xin Li
33fa441a86 Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: cb1056f9b4 -s ours am: 4f83509810
am: a038fb9044  -s ours

Change-Id: Ibfdba393783ac392dde8a42418b3cf8bfc8e34ff
2017-12-08 03:35:08 +00:00
TreeHugger Robot
c66dbdc2c5 Merge "Add controllers for default app shortcut preferences." 2017-12-08 02:20:11 +00:00
Bill Yi
3ed385256a Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I35a94b9a271e88bf4f0384d5619c59661516131d
2017-12-07 17:08:40 -08:00
Bill Yi
3ea52be26d Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I59dde21252b7681bb6dfcf9dae1f27192a3cd19e
2017-12-07 17:08:11 -08:00
TreeHugger Robot
81bd85ab80 Merge "Depend settings on slices in the support library" 2017-12-08 00:51:19 +00:00
TreeHugger Robot
546d440931 Merge "Move codes generating html file from xml files to SettingsLib (1/2)" 2017-12-08 00:32:38 +00:00
Fan Zhang
ed6805142f Merge "Update asset for no search result image" into oc-mr1-dev
am: afa1efabad

Change-Id: Ib77d2973bf4f2155a7bdd73174fd4c4b9903bc17
2017-12-08 00:25:31 +00:00
TreeHugger Robot
afa1efabad Merge "Update asset for no search result image" into oc-mr1-dev 2017-12-08 00:19:09 +00:00
Fan Zhang
3ba0381567 Update feature flag dashboard UI to display all features
Bug: 36222960
Test: robotests
Change-Id: I1aea8f32df9bd8ae24708374b60d173953a7c266
2017-12-07 16:11:58 -08:00
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
Doris Ling
765007b0bf Add controllers for default app shortcut preferences.
- add the default app shortcut preferences to the preference screen
xml instead of creating them dynamically in the fragment.
- add controller for each of the shortcut preference.
- move the corresponding shortcut detail settings into the appinfo
package.
- add individual preference screen xml for the shortcut detail settings
instead of using the shared screen template.

Bug: 69384089
Test: make RunSettingsRoboTests
Change-Id: I7bc0b3b727e87fb1a32a82291e64b8e290947671
2017-12-07 15:42:28 -08: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
Xin Li
a038fb9044 Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: cb1056f9b4 -s ours
am: 4f83509810

Change-Id: I72dd8e97a660beaca9343cea99ef117a202fdf35
2017-12-07 15:23:18 +00:00
Xin Li
4f83509810 Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: cb1056f9b4  -s ours

Change-Id: Iba281b420566a85ffebf98941dbb5e456b724362
2017-12-07 15:17:25 +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
Xin Li
cb1056f9b4 Merge "DO NOT MERGE: Merge Oreo MR1 into master" 2017-12-06 23:18:29 +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
Jaekyun Seok
47f6e54895 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
2017-12-07 06:41:30 +09: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
Matthew Fritze
b277557991 Depend settings on slices in the support library
Test: make
Bug: 67996923
Change-Id: Ifcb544424df27f3faa8872e6266de286cc706d59
2017-12-06 08:19:07 -08: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