OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoMerge "Add infra for battery tip"
Lei Yu [Tue, 19 Dec 2017 23:42:28 +0000 (23:42 +0000)]
Merge "Add infra for battery tip"

6 years agoMerge "Unit test for screen timeout policy handling in Settings"
TreeHugger Robot [Tue, 19 Dec 2017 22:43:41 +0000 (22:43 +0000)]
Merge "Unit test for screen timeout policy handling in Settings"

6 years agoAdd infra for battery tip
jackqdyulei [Tue, 12 Dec 2017 20:52:35 +0000 (12:52 -0800)]
Add infra for battery tip

This cl adds the basic structure for battery tip:
1. BaseBatteryTip: Model class to represent the tip and build
preference and dialog
2. SummaryTip: Display a general battery summary(i.e. your battery
is good..)
3. BatteryTipLoader: AsyncLoader to load the battery tips.
4. BatteryTipPreferenceController: preference controller for
preference group to display battery tips

This cl also:
1. Remove the anomaly code in PowerUsageSummary and we will add it
to app restriction in future.
2. Add preference_category_no_title.xml to avoid the extra 32dp
blank at the top.

Bug: 70570352
Test: RunSettingsRoboTests
Change-Id: If91a553888e2eb91d55fb1d0d7bbea69652f144c

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 19 Dec 2017 21:06:04 +0000 (21:06 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoUnit test for screen timeout policy handling in Settings
Pavel Grafov [Fri, 15 Dec 2017 18:42:11 +0000 (18:42 +0000)]
Unit test for screen timeout policy handling in Settings

This is a follow-up for http://ag/3123412

Test: make ROBOTEST_FILTER=LockAfterTimeoutPreferenceControllerTest RunSettingsRoboTests
Test: make ROBOTEST_FILTER=TimeoutPreferenceControllerTest RunSettingsRoboTests

Bug: 63908311
Change-Id: I27631743d52163f3b6d1589b427ba617e74725a9

6 years agoMerge "Fix UniquePreferenceTest"
Fan Zhang [Tue, 19 Dec 2017 20:22:18 +0000 (20:22 +0000)]
Merge "Fix UniquePreferenceTest"

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 19 Dec 2017 04:28:05 +0000 (20:28 -0800)]
Import translations. DO NOT MERGE

Change-Id: I7bbec8bd3d4424dfaeefc0770d3057993963ba86
Auto-generated-cl: translation import

6 years agoFix UniquePreferenceTest
Fan Zhang [Tue, 19 Dec 2017 18:08:13 +0000 (10:08 -0800)]
Fix UniquePreferenceTest

Bug: 70638967
Test: atest UniquePreferenceTest
Change-Id: Idf06ccd9580d66c051f9b7c910c567f321da6cc5

6 years agoImport translations. DO NOT MERGE am: 596de5e45c -s ours am: 1f229d3710 -s ours
Bill Yi [Tue, 19 Dec 2017 18:29:37 +0000 (18:29 +0000)]
Import translations. DO NOT MERGE am: 596de5e45c  -s ours am: 1f229d3710  -s ours
am: 5855abd505  -s ours

Change-Id: Ic053ab937a42908b304fb161d279822e6348a31a

6 years agoImport translations. DO NOT MERGE am: 1e9183e0c0 -s ours
Bill Yi [Tue, 19 Dec 2017 18:29:06 +0000 (18:29 +0000)]
Import translations. DO NOT MERGE am: 1e9183e0c0  -s ours
am: d704c83a85  -s ours

Change-Id: I68072d1b21ed307e335950c7200c29868748d33e

6 years agoImport translations. DO NOT MERGE am: 596de5e45c -s ours
Bill Yi [Tue, 19 Dec 2017 18:26:45 +0000 (18:26 +0000)]
Import translations. DO NOT MERGE am: 596de5e45c  -s ours
am: 1f229d3710  -s ours

Change-Id: I645bf5d31fcb64d19b2e2b81771d62831e0997e1

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 19 Dec 2017 18:24:44 +0000 (18:24 +0000)]
Import translations. DO NOT MERGE
am: 596de5e45c  -s ours

Change-Id: Id2b718512440b8d3703244fc6825bfad8579e8cc

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 19 Dec 2017 18:24:12 +0000 (18:24 +0000)]
Import translations. DO NOT MERGE
am: 1e9183e0c0  -s ours

Change-Id: If5b2efde1e32b8ea773c29bbd14c65e9cb0f5996

6 years agoMerge "Check password blacklist when setting credential"
Andrew Scull [Tue, 19 Dec 2017 18:01:55 +0000 (18:01 +0000)]
Merge "Check password blacklist when setting credential"

6 years agoMerge "Revert "Moving settings tests into the settings package""
TreeHugger Robot [Tue, 19 Dec 2017 07:50:03 +0000 (07:50 +0000)]
Merge "Revert "Moving settings tests into the settings package""

6 years agoRevert "Moving settings tests into the settings package"
Ashita Sriraman [Tue, 19 Dec 2017 06:25:54 +0000 (06:25 +0000)]
Revert "Moving settings tests into the settings package"

This reverts commit 54fa3c5e413b8f9163bf2bae820dbf08c3671867.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Id90d8718b4b0db3f3831fb2dc82cae6aea6c9170

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 19 Dec 2017 04:43:20 +0000 (20:43 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie62b3a6c465b7d0f011cfdc5e51fb3f195ed4306

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 19 Dec 2017 04:37:58 +0000 (20:37 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ib8ace3f2052b60e0623095c5647b9c9c3b2c199c

6 years agoMerge "Update dialog styles to material 2"
TreeHugger Robot [Tue, 19 Dec 2017 02:01:38 +0000 (02:01 +0000)]
Merge "Update dialog styles to material 2"

6 years agoMerge "Moving settings tests into the settings package Test: Built successfully Chang...
Ashita Sriraman [Tue, 19 Dec 2017 00:42:35 +0000 (00:42 +0000)]
Merge "Moving settings tests into the settings package Test: Built successfully Change-Id: I53d8a5cdd4bce6049707c09a284ebc145efeddc1"

6 years agoMerge "Launch new Home app when selecting Home app in Settings" am: f05fc290b7 am...
rongrong.x.gao [Mon, 18 Dec 2017 22:27:30 +0000 (22:27 +0000)]
Merge "Launch new Home app when selecting Home app in Settings" am: f05fc290b7 am: b0ab6da4e3
am: fbc9e954d7

Change-Id: Ifffdd0e1d6f3df829d9e4cc9710876d415a33420

6 years agoMerge "Launch new Home app when selecting Home app in Settings" am: f05fc290b7
rongrong.x.gao [Mon, 18 Dec 2017 22:19:28 +0000 (22:19 +0000)]
Merge "Launch new Home app when selecting Home app in Settings" am: f05fc290b7
am: b0ab6da4e3

Change-Id: I741b464e9903c13d68a3025d6cfbb057159ee950

6 years agoMerge "Launch new Home app when selecting Home app in Settings"
rongrong.x.gao [Mon, 18 Dec 2017 22:16:32 +0000 (22:16 +0000)]
Merge "Launch new Home app when selecting Home app in Settings"
am: f05fc290b7

Change-Id: I5b9e419fb420351dba76c5dfe1f238f5e4a7e562

6 years agoMerge "Launch new Home app when selecting Home app in Settings"
Treehugger Robot [Mon, 18 Dec 2017 22:09:25 +0000 (22:09 +0000)]
Merge "Launch new Home app when selecting Home app in Settings"

6 years agoMerge "Rename setDataEnabled to setUserDataEnabled."
TreeHugger Robot [Mon, 18 Dec 2017 22:08:37 +0000 (22:08 +0000)]
Merge "Rename setDataEnabled to setUserDataEnabled."

6 years agoMerge "Revamp the network detail page"
TreeHugger Robot [Mon, 18 Dec 2017 20:47:31 +0000 (20:47 +0000)]
Merge "Revamp the network detail page"

6 years agoMerge "Introduce config_show_wallpaper_attribution."
TreeHugger Robot [Mon, 18 Dec 2017 20:46:59 +0000 (20:46 +0000)]
Merge "Introduce config_show_wallpaper_attribution."

6 years agoMerge "Add preference controller for app header view."
TreeHugger Robot [Mon, 18 Dec 2017 20:46:53 +0000 (20:46 +0000)]
Merge "Add preference controller for app header view."

6 years agoMoving settings tests into the settings package
Ashita Sriraman [Thu, 14 Dec 2017 19:11:24 +0000 (11:11 -0800)]
Moving settings tests into the settings package
Test: Built successfully
Change-Id: I53d8a5cdd4bce6049707c09a284ebc145efeddc1

6 years agoMerge "Move PowerWhitelistBackend to SettingsLib"
Tony Mantler [Mon, 18 Dec 2017 19:45:53 +0000 (19:45 +0000)]
Merge "Move PowerWhitelistBackend to SettingsLib"

6 years agoRevamp the network detail page
jackqdyulei [Mon, 18 Dec 2017 19:07:35 +0000 (11:07 -0800)]
Revamp the network detail page

1. Update the title to be wifi name
2. Add "Advanced" category

Bug: 68029969
Test: Screenshot
Change-Id: Ie0502b22336de7af2c2b1b706b51f340685b2413

6 years agoCheck password blacklist when setting credential
Alexandru-Andrei Rotaru [Mon, 7 Aug 2017 11:21:31 +0000 (12:21 +0100)]
Check password blacklist when setting credential

If the password is valid by all other checks, see if it is present on
the blacklist and disallow it if it is.

Test: set a password blacklist, try and set a blacklisted password and
see an explanation, set a non-blacklisted password successfully.
Test: make ROBOTEST_FILTER=ChooseLockPasswordTest RunSettingsRoboTests

Bug: 63578054
Fix: 65659151
Change-Id: Id155b824ad4b5839c23b6f5fd3fdfdcfc78c3df1

6 years agoLaunch new Home app when selecting Home app in Settings
rongrong.x.gao [Thu, 2 Mar 2017 09:29:34 +0000 (17:29 +0800)]
Launch new Home app when selecting Home app in Settings

Launches the newly selected Home app when it has been selected in
Default Home app settings. This CL makes the change take effect
immediately, instead of when the Home button is pressed.

Bug: 70697830
Test: make RunSettingsRoboTests
Test: Manual - Change default home app in Settings
Change-Id: If7e2956bc6f8ddba0a7e8da48a0d38e3936c57e9

6 years agoMerge "Add setting to disable animations"
TreeHugger Robot [Sat, 16 Dec 2017 02:21:20 +0000 (02:21 +0000)]
Merge "Add setting to disable animations"

6 years agoAdd setting to disable animations
Phil Weaver [Sat, 16 Dec 2017 00:13:41 +0000 (16:13 -0800)]
Add setting to disable animations

Fixes: 12910879
Test: make RunSettingsRoboTests
Also went to Settings -> Accessibility, turned off animations,
and observed that animations stopped. Turned it back on, and
the came back. Also fiddled with the granular settings in
developer options, which behaved as expected.

Change-Id: I189fbc4152d3cdb5ee45562c33f94c739f569c32

6 years agoMerge "Make Settings aware of legacy user keys with secret key prefix"
Janis Danisevskis [Fri, 15 Dec 2017 23:48:55 +0000 (23:48 +0000)]
Merge "Make Settings aware of legacy user keys with secret key prefix"

6 years agoMerge "Fix NPE when press ttsEngines settings icon" am: 4b6e1b0758 am: 57b9039750
tiansiming [Fri, 15 Dec 2017 22:41:34 +0000 (22:41 +0000)]
Merge "Fix NPE when press ttsEngines settings icon" am: 4b6e1b0758 am: 57b9039750
am: 576e159641

Change-Id: I475b444fffea5a45532144bc85b7464979fa7a0d

6 years agoMerge "Fix NPE when press ttsEngines settings icon" am: 4b6e1b0758
tiansiming [Fri, 15 Dec 2017 22:38:29 +0000 (22:38 +0000)]
Merge "Fix NPE when press ttsEngines settings icon" am: 4b6e1b0758
am: 57b9039750

Change-Id: Iae5884c2950e479c746e7b7761a40c250121dc16

6 years agoMerge "Fix NPE when press ttsEngines settings icon"
tiansiming [Fri, 15 Dec 2017 22:35:52 +0000 (22:35 +0000)]
Merge "Fix NPE when press ttsEngines settings icon"
am: 4b6e1b0758

Change-Id: I7d90bfce2e4f5d13b66f0e408ab9ff4273f6eac6

6 years agoMerge "Fix NPE when press ttsEngines settings icon"
Treehugger Robot [Fri, 15 Dec 2017 22:30:04 +0000 (22:30 +0000)]
Merge "Fix NPE when press ttsEngines settings icon"

6 years agoUpdate dialog styles to material 2
Ajay Nadathur [Fri, 15 Dec 2017 01:27:27 +0000 (17:27 -0800)]
Update dialog styles to material 2

Bug: 69930374
Test: Manually tested
Change-Id: I4215d0283cbbfcc929b891f5b419b52b1de8598a

6 years agoMake Settings aware of legacy user keys with secret key prefix
Janis Danisevskis [Wed, 19 Apr 2017 23:23:02 +0000 (16:23 -0700)]
Make Settings aware of legacy user keys with secret key prefix

Secret keys are not longer identifiable by their alias prefix.
So now we call getKeyCharacteristics and check the algorithm of the
key.

Bug: 63931634
Test: Manually installed a key and checked that it is still dispayed
      correctly.
Change-Id: I55a4e46434618cb52ceb9456f184e004165872fd

6 years agoMove PowerWhitelistBackend to SettingsLib
Tony Mantler [Fri, 15 Dec 2017 18:08:26 +0000 (10:08 -0800)]
Move PowerWhitelistBackend to SettingsLib

Bug: 70716754
Test: RunSettingsRoboTests
Change-Id: I897ce3469bb2d72a0cbe96b16b8de1a565ba4e64

6 years agoTurn on the new connected device page by default
jackqdyulei [Fri, 15 Dec 2017 18:42:15 +0000 (10:42 -0800)]
Turn on the new connected device page by default

Bug: 69926683
Test: RunSettingsRoboTests
Change-Id: Ice589b825226e92eace5f5fa6b58499a13e36ef8

6 years agoMerge "Respect DISALLOW_UNIFIED_PASSWORD in Settings."
Pavel Grafov [Fri, 15 Dec 2017 13:47:48 +0000 (13:47 +0000)]
Merge "Respect DISALLOW_UNIFIED_PASSWORD in Settings."

6 years agoMerge "Switch to modern ArgumentMatchers" am: b8bf3bbc72 am: ced2263d48
Philip P. Moltmann [Fri, 15 Dec 2017 12:00:25 +0000 (12:00 +0000)]
Merge "Switch to modern ArgumentMatchers" am: b8bf3bbc72 am: ced2263d48
am: e360d51476

Change-Id: I2fb154f48bcfedecb5dbd8ccb2792ba34366ed71

6 years agoMerge "Switch to modern ArgumentMatchers" am: b8bf3bbc72
Philip P. Moltmann [Fri, 15 Dec 2017 11:04:48 +0000 (11:04 +0000)]
Merge "Switch to modern ArgumentMatchers" am: b8bf3bbc72
am: ced2263d48

Change-Id: Iccb726dc2166bb1e30f39f7f6539fb74e1d83997

6 years agoMerge "Switch to modern ArgumentMatchers"
Philip P. Moltmann [Fri, 15 Dec 2017 10:48:38 +0000 (10:48 +0000)]
Merge "Switch to modern ArgumentMatchers"
am: b8bf3bbc72

Change-Id: I81455eceac3a4273dc0bfd439fefa21c3b6f571c

6 years agoMerge "Switch to modern ArgumentMatchers"
Treehugger Robot [Fri, 15 Dec 2017 10:33:13 +0000 (10:33 +0000)]
Merge "Switch to modern ArgumentMatchers"

6 years agoIntroduce config_show_wallpaper_attribution.
Ben Lin [Wed, 13 Dec 2017 00:44:53 +0000 (16:44 -0800)]
Introduce config_show_wallpaper_attribution.

This introduces a boolean flag in which when set to true, Wallpaper
Attribution will be shown in the Legal page. When set to false, it
will be hidden. Wallpaper has always been removed from search results,
so that has not changed.

Bug: 62378616
Test: make RunSettingsRoboTests ROBOTEST_FILTER=LegalSettings passes.
Change-Id: Ia6f3e7d1ef471eecf79f1b46616fa4ba27d35748

6 years agoAdd preference controller for app header view.
Doris Ling [Thu, 14 Dec 2017 22:23:41 +0000 (14:23 -0800)]
Add preference controller for app header view.

- move code related to initializing/refreshing the app header from
AppInfoDashboardFragment into a new controller.
- this is the last preference logic in AppInfoDashboardFragment. With
this change, the conversion into dashboad fragment will be considered
as complete.
- remaining work for the bug will be enable the feature flag and remove
the obsolete InstalledAppDetails.

Bug: 69384089
Test: make RunSettingsRoboTests
Change-Id: I14056bf291278b2b36f9502177c84edd6a899d0f

6 years agoMerge "Clarify secondary dnd media text."
TreeHugger Robot [Thu, 14 Dec 2017 22:04:11 +0000 (22:04 +0000)]
Merge "Clarify secondary dnd media text."

6 years agoClarify secondary dnd media text.
Beverly [Thu, 14 Dec 2017 20:29:28 +0000 (15:29 -0500)]
Clarify secondary dnd media text.

Bug: 63077372
Test: manual
Change-Id: I38f249851fc5122e89dd3cc33124068598475751

6 years agoMerge "Hide Location Mode from search results if it's not available."
TreeHugger Robot [Thu, 14 Dec 2017 18:08:44 +0000 (18:08 +0000)]
Merge "Hide Location Mode from search results if it's not available."

6 years agoMerge "Add PowerUsageSummaryLegacy to Restricted list."
Lei Yu [Thu, 14 Dec 2017 18:05:11 +0000 (18:05 +0000)]
Merge "Add PowerUsageSummaryLegacy to Restricted list."

6 years agoSwitch to modern ArgumentMatchers
Philip P. Moltmann [Thu, 23 Nov 2017 00:07:48 +0000 (16:07 -0800)]
Switch to modern ArgumentMatchers

Test: adb shell am instrument -w -e class com.android.settings.vpn2.PreferenceListTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner

Change-Id: Id2e4684f6d3048cfb60fee1f747d0796c157a3da

6 years agoMerge "Add developer option control for GNSS duty cycling."
TreeHugger Robot [Thu, 14 Dec 2017 15:49:17 +0000 (15:49 +0000)]
Merge "Add developer option control for GNSS duty cycling."

6 years agoMerge "Add a unit test for the AppOps permission for displaying UI overlays."
Peter Visontay [Thu, 14 Dec 2017 13:49:18 +0000 (13:49 +0000)]
Merge "Add a unit test for the AppOps permission for displaying UI overlays."

6 years agoMerge "Add preference controller for app action buttons."
TreeHugger Robot [Thu, 14 Dec 2017 02:07:39 +0000 (02:07 +0000)]
Merge "Add preference controller for app action buttons."

6 years agoAdd developer option control for GNSS duty cycling.
gomo [Wed, 13 Dec 2017 11:44:09 +0000 (03:44 -0800)]
Add developer option control for GNSS duty cycling.

Duty Cycling control is one of the Android-P features. In Android-P the
feature will be controlled via a Developer Options button with no
public API. This CL adds the button and connect it to be read via the
GnssLocationProivder to control the feature. Also Roboelectric test
added.

Bug: 64009176
Test: Tested on Android-P build and works as expected. Also Robolectric test added.
Change-Id: Icc0d259719cf9034caf2c78c790b914ab4292597

6 years agoHide Location Mode from search results if it's not available.
Ben Lin [Wed, 6 Dec 2017 19:31:55 +0000 (11:31 -0800)]
Hide Location Mode from search results if it's not available.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=LocationModeTest all
passes.
Bug: 70283459
Change-Id: Id99d4a8f694b6f223ee8ead9701569840e333a9e

6 years agoMerge "Switch to modern ArgumentMatchers"
Philip P. Moltmann [Wed, 13 Dec 2017 23:40:08 +0000 (23:40 +0000)]
Merge "Switch to modern ArgumentMatchers"

6 years agoMerge "Add Slices Data object and DB Contract"
TreeHugger Robot [Wed, 13 Dec 2017 23:01:36 +0000 (23:01 +0000)]
Merge "Add Slices Data object and DB Contract"

6 years agoMerge "Simplify DND Behavior secondary text"
TreeHugger Robot [Wed, 13 Dec 2017 22:59:43 +0000 (22:59 +0000)]
Merge "Simplify DND Behavior secondary text"

6 years agoAdd preference controller for app action buttons.
Doris Ling [Wed, 13 Dec 2017 22:12:27 +0000 (14:12 -0800)]
Add preference controller for app action buttons.

- move code related to initializing/refreshing the action buttons from
AppInfoDashboardFragment into a new controller.

Bug: 69384089
Test: make RunSettingsRoboTests
Change-Id: I8eb5f42a1b6d3c35f5a9e1356a9e5e31f643d5d3

6 years agoMerge "Move AppInfoDashboardFragment into appinfo package."
TreeHugger Robot [Wed, 13 Dec 2017 21:22:36 +0000 (21:22 +0000)]
Merge "Move AppInfoDashboardFragment into appinfo package."

6 years agoSimplify DND Behavior secondary text
Beverly [Wed, 13 Dec 2017 20:08:30 +0000 (15:08 -0500)]
Simplify DND Behavior secondary text

Bug: 63077372
Change-Id: I0ac305ff429de27a65667441703b938305d8a03f
Fixes: 70627215
Test: make ROBOTEST_FILTER=ZenModeSettingsTest RunSettingsRoboTests -j40

6 years agoMerge "Adopt robolectric 3.5.1"
James Lemieux [Wed, 13 Dec 2017 19:31:37 +0000 (19:31 +0000)]
Merge "Adopt robolectric 3.5.1"

6 years agoAdd Slices Data object and DB Contract
Matthew Fritze [Mon, 11 Dec 2017 23:01:11 +0000 (15:01 -0800)]
Add Slices Data object and DB Contract

Add in a Data object used to represent one row
in a new SQLite database used for building Slices.

The database has the following schema:
- Key
- Title
- Subtitle
- Screentitle
- Icon
- Fragment
- Controller

The key is the preference key.
Title, subtitle and Icon are for UI info.
Screentitle and fragment are for the intent.
Controller is used to get dynamic ui info (like summary),
and to take actions on the slice (like a toggle).

The actual indexing and a Slice will be handled in a subsquent CL,
but a prototype can be found here: ag/3324435

Test: robotests
Bug: 67996923
Change-Id: Id91deb58a3ab89ce1dab5a3f34cdb9ade6263aa8

6 years agoAdd a unit test for the AppOps permission for displaying UI overlays.
Peter Visontay [Wed, 13 Dec 2017 17:31:41 +0000 (17:31 +0000)]
Add a unit test for the AppOps permission for displaying UI overlays.

The test logic is the same as ExetrnalSourcesSettingsTest but I moved/renamed some methods so both AppOps tests can use them.

Test: make -j32 SettingsUnitTests && adb install -r out/target/product/marlin/data/app/SettingsUnitTests/SettingsUnitTests.apk && adb shell am instrument -w -e class com.android.settings.applications.ExternalSourcesSettingsTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Test: same as above, but for DrawOverlaySettingsTest
Change-Id: Ifc0f0985a4cb4a82a00839aeb4cd4216c777250e

6 years agoMerge "Add signal strength customization"
Jordan Liu [Wed, 13 Dec 2017 18:20:08 +0000 (18:20 +0000)]
Merge "Add signal strength customization"

6 years agoAdd PowerUsageSummaryLegacy to Restricted list.
jackqdyulei [Wed, 13 Dec 2017 18:18:23 +0000 (10:18 -0800)]
Add PowerUsageSummaryLegacy to Restricted list.

Then in guest/secondary user it is also possible to show
battery settings.

Bug: 70606597
Test: Manual
Change-Id: I7993abbf988926d0890229e9c14c779906be6e23

6 years agoMerge "Handle getActiveAdmins() == null safely." am: d46153c3d3 am: 70a6dfd647
Robin Lee [Wed, 13 Dec 2017 17:31:16 +0000 (17:31 +0000)]
Merge "Handle getActiveAdmins() == null safely." am: d46153c3d3 am: 70a6dfd647
am: df5053e85b

Change-Id: I8f01cd4716ead11e7671e5fa572b8cd01087899c

6 years agoMerge "Handle getActiveAdmins() == null safely." am: d46153c3d3
Robin Lee [Wed, 13 Dec 2017 17:28:34 +0000 (17:28 +0000)]
Merge "Handle getActiveAdmins() == null safely." am: d46153c3d3
am: 70a6dfd647

Change-Id: I98ccb0e4eb0882e10c0266d3f1fbbddaa1073db8

6 years agoMerge "Handle getActiveAdmins() == null safely."
Robin Lee [Wed, 13 Dec 2017 17:24:00 +0000 (17:24 +0000)]
Merge "Handle getActiveAdmins() == null safely."
am: d46153c3d3

Change-Id: If8a1bcdaa5c106394e4c00add45765d27c80e0ef

6 years agoMerge "Handle getActiveAdmins() == null safely."
Treehugger Robot [Wed, 13 Dec 2017 17:16:38 +0000 (17:16 +0000)]
Merge "Handle getActiveAdmins() == null safely."

6 years agoMerge "Import translations. DO NOT MERGE am: 1d6d60f251 -s ours" into oc-mr1-dev...
Android Build Merger (Role) [Wed, 13 Dec 2017 13:25:18 +0000 (13:25 +0000)]
Merge "Import translations. DO NOT MERGE am: 1d6d60f251  -s ours" into oc-mr1-dev am: ad44ea442b  -s ours
am: 937902f2f5  -s ours

Change-Id: Ibd076af118eb15993d7ecf37dbbcd77f371f892e

6 years agoImport translations. DO NOT MERGE am: e30af484ff -s ours
Bill Yi [Wed, 13 Dec 2017 13:24:40 +0000 (13:24 +0000)]
Import translations. DO NOT MERGE am: e30af484ff  -s ours
am: b63129a388  -s ours

Change-Id: I1ba68b8ecf7f17d813ffc6023fc0589b2eb08ff6

6 years agoMerge "Import translations. DO NOT MERGE am: 1d6d60f251 -s ours" into oc-mr1-dev
Android Build Merger (Role) [Wed, 13 Dec 2017 13:23:07 +0000 (13:23 +0000)]
Merge "Import translations. DO NOT MERGE am: 1d6d60f251  -s ours" into oc-mr1-dev
am: ad44ea442b  -s ours

Change-Id: I8d26666caaa62bb95fed60d484368fc5b191bdcd

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 13 Dec 2017 13:22:04 +0000 (13:22 +0000)]
Import translations. DO NOT MERGE
am: e30af484ff  -s ours

Change-Id: If2100d09d2f2c16f27e3c77ecaeded8fee5ebc90

6 years agoMerge "Import translations. DO NOT MERGE am: 1d6d60f251 -s ours" into oc-mr1-dev
Android Build Merger (Role) [Wed, 13 Dec 2017 13:19:40 +0000 (13:19 +0000)]
Merge "Import translations. DO NOT MERGE am: 1d6d60f251  -s ours" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 13 Dec 2017 13:19:06 +0000 (13:19 +0000)]
Import translations. DO NOT MERGE
am: 1d6d60f251  -s ours

Change-Id: I3a20f9e9061dbaf15f5f61a3f5f0a146c128ff2e

6 years agoMerge "Fix crashes related to ExternalSourcesDetails."
TreeHugger Robot [Wed, 13 Dec 2017 07:02:07 +0000 (07:02 +0000)]
Merge "Fix crashes related to ExternalSourcesDetails."

6 years agoMerge "Add power save action to BatteryBroadcastReceiver"
TreeHugger Robot [Wed, 13 Dec 2017 02:54:59 +0000 (02:54 +0000)]
Merge "Add power save action to BatteryBroadcastReceiver"

6 years agoMerge "Bluetooth: Add support for PBAP UI preference" am: f689d1aaa7 am: 0b4c0ebbe4
Hemant Gupta [Wed, 13 Dec 2017 02:26:01 +0000 (02:26 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference" am: f689d1aaa7 am: 0b4c0ebbe4
am: 40069b5ee2

Change-Id: I57de94d04d73ed1af24a15b36a73ea0692ad9815

6 years agoMerge "Fix screen freeze when changing display size in Multi-Window mode" am: 2051822...
Wang wenrui [Wed, 13 Dec 2017 02:25:04 +0000 (02:25 +0000)]
Merge "Fix screen freeze when changing display size in Multi-Window mode" am: 2051822bb9 am: b2a6489139
am: 9b3b72f6b2

Change-Id: I4d3e3ef484d93535eb599104330048e1610cb370

6 years agoMerge "Bluetooth: Add support for PBAP UI preference" am: f689d1aaa7
Hemant Gupta [Wed, 13 Dec 2017 01:57:51 +0000 (01:57 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference" am: f689d1aaa7
am: 0b4c0ebbe4

Change-Id: I5419efe379ee5bf0622ac8070b6ef3886d277bdf

6 years agoMerge "Fix screen freeze when changing display size in Multi-Window mode" am: 2051822bb9
Wang wenrui [Wed, 13 Dec 2017 01:56:50 +0000 (01:56 +0000)]
Merge "Fix screen freeze when changing display size in Multi-Window mode" am: 2051822bb9
am: b2a6489139

Change-Id: I791f25687e37448659b3e0d91ad35f28dca0fed6

6 years agoAdopt robolectric 3.5.1
James Lemieux [Wed, 13 Dec 2017 01:31:47 +0000 (17:31 -0800)]
Adopt robolectric 3.5.1

Bug: 70581603
Test: make RunSettingsRoboTests
Change-Id: I21dba3381ae62ee12de1ce29bea473b3d0f069c0

6 years agoMerge "Bluetooth: Add support for PBAP UI preference"
Hemant Gupta [Wed, 13 Dec 2017 01:27:46 +0000 (01:27 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference"
am: f689d1aaa7

Change-Id: Ic4ffc6a26b11cdf0a937402c3bdcd68441fe4aed

6 years agoMerge "Fix screen freeze when changing display size in Multi-Window mode"
Wang wenrui [Wed, 13 Dec 2017 01:26:52 +0000 (01:26 +0000)]
Merge "Fix screen freeze when changing display size in Multi-Window mode"
am: 2051822bb9

Change-Id: I974abe3dd2114aa439c0db46fa4930a947912de6

6 years agoMerge changes Ie1f934b4,Ic3b045a6
Lei Yu [Wed, 13 Dec 2017 01:06:14 +0000 (01:06 +0000)]
Merge changes Ie1f934b4,Ic3b045a6

* changes:
  Create BluetoothSwitchPreference
  Add ConnectedUsbDeviceUpdater

6 years agoMove AppInfoDashboardFragment into appinfo package.
Doris Ling [Thu, 7 Dec 2017 23:30:18 +0000 (15:30 -0800)]
Move AppInfoDashboardFragment into appinfo package.

- update all references to AppInfoDashboardFragment
- removed PackageUtil inner class and change the corresponding function
to be a simple method.

Bug: 69384089
Test: make RunSettingsRoboTests
Change-Id: Ief067e25a303ef16db20b2ca1d8840cb06eff5f9

6 years agoMerge "Add controllers for iinstant app related preferences."
TreeHugger Robot [Wed, 13 Dec 2017 00:56:56 +0000 (00:56 +0000)]
Merge "Add controllers for iinstant app related preferences."

6 years agoAdd power save action to BatteryBroadcastReceiver
jackqdyulei [Tue, 12 Dec 2017 00:53:40 +0000 (16:53 -0800)]
Add power save action to BatteryBroadcastReceiver

This cl makes BatteryBroadcastReceiver also listen to update about
battery saver.

Bug: 70530651
Test: RunSettingsRoboTests
Change-Id: I76b2f1b1047aa195ee9d8ff2a8a330cea31039d4

6 years agoMerge "Bluetooth: Add support for PBAP UI preference"
Treehugger Robot [Wed, 13 Dec 2017 00:30:42 +0000 (00:30 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference"

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 13 Dec 2017 00:25:18 +0000 (16:25 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If249fffda6df063fd39ec95e4ba04b412a1ea9e1

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 13 Dec 2017 00:19:14 +0000 (16:19 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I37fb135ddf373093ede9b1d56bf6452ea52ef093

6 years agoMerge "Add PrefController in XML support"
TreeHugger Robot [Wed, 13 Dec 2017 00:02:35 +0000 (00:02 +0000)]
Merge "Add PrefController in XML support"

6 years agoMerge "Fix screen freeze when changing display size in Multi-Window mode"
Treehugger Robot [Tue, 12 Dec 2017 23:59:23 +0000 (23:59 +0000)]
Merge "Fix screen freeze when changing display size in Multi-Window mode"