OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoGet auto-battery saver threshold max from global setting
Makoto Onuki [Wed, 7 Mar 2018 22:03:55 +0000 (14:03 -0800)]
Get auto-battery saver threshold max from global setting

Bug: 74351418
Test: Manual test with "settings put global low_power_trigger_level_max 100"
Test: m ROBOTEST_FILTER=AutoBatterySeekBarPreferenceControllerTest RunSettingsRoboTests
Change-Id: Ice25835f36e7855e3ed665cd780d7eb1a26acd27

6 years agoFix tests
Fan Zhang [Tue, 6 Mar 2018 17:08:29 +0000 (09:08 -0800)]
Fix tests

Change-Id: I8b750a87e6852d60ac2f8f61a955b1296cef759b
Fixes: 74234076
Test: robotests

6 years agoMerge "Reuse xml parser logic to scrape preference xml files." into pi-dev
Fan Zhang [Tue, 6 Mar 2018 00:24:40 +0000 (00:24 +0000)]
Merge "Reuse xml parser logic to scrape preference xml files." into pi-dev

6 years agoMerge "Fix double help icon in wificalling screen" into pi-dev
Fan Zhang [Mon, 5 Mar 2018 23:43:05 +0000 (23:43 +0000)]
Merge "Fix double help icon in wificalling screen" into pi-dev

6 years agoReuse xml parser logic to scrape preference xml files.
Fan Zhang [Thu, 22 Feb 2018 23:54:40 +0000 (15:54 -0800)]
Reuse xml parser logic to scrape preference xml files.

Bug: 73668763
Test: atest
Test: robotests
Change-Id: Ifc241b5b4ec6d2935c4c532ff902a7ba352a98d6

6 years agoCorrectly propagate bundle extra from intent to fragment
Fan Zhang [Fri, 2 Mar 2018 19:01:15 +0000 (11:01 -0800)]
Correctly propagate bundle extra from intent to fragment

When someone launches settings intent and include args for fragment, we
should propagate the args to fragment.

Change-Id: I231a675123f056043e96ffad7498da6b9bc16687
Fixes: 74017572
Test: manual

6 years agoFix double help icon in wificalling screen
Fan Zhang [Mon, 5 Mar 2018 21:19:46 +0000 (13:19 -0800)]
Fix double help icon in wificalling screen

Change-Id: I36d4af83e1cb7fd77b360829baab2004422488c6
Fixes: 71538192
Test: robotests

6 years agoUse external/robolectric-shadows/run_robotests.mk
James Lemieux [Mon, 26 Feb 2018 08:51:42 +0000 (00:51 -0800)]
Use external/robolectric-shadows/run_robotests.mk

This allows Settings to test against the latest framework changes.

Also replaced TestConfig with traditional robolectric.properties.

Bug: 73173204
Bug: 73892008
Test: make -j56 RunSettingsRoboTests
Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7

6 years agoMerge "Time Zone data loader"
Victor Chang [Sat, 3 Mar 2018 15:39:51 +0000 (15:39 +0000)]
Merge "Time Zone data loader"

6 years agoImport translations. DO NOT MERGE am: 509d7bbc5d -s ours
Bill Yi [Sat, 3 Mar 2018 12:54:10 +0000 (12:54 +0000)]
Import translations. DO NOT MERGE am: 509d7bbc5d  -s ours
am: 3cf7a46b83  -s ours

Change-Id: I5bd457b3f4acdfbadc5f59372a4e268f2373b617

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 3 Mar 2018 12:50:06 +0000 (12:50 +0000)]
Import translations. DO NOT MERGE
am: 509d7bbc5d  -s ours

Change-Id: I3e779491dc73f006b0f759d02b0072a06b952ead

6 years agoSettings reflect new a11y shortcut on lockscreen
Phil Weaver [Sat, 3 Mar 2018 00:07:51 +0000 (16:07 -0800)]
Settings reflect new a11y shortcut on lockscreen

Matching changes to the framework behavior. The
setting is on by default iff the user has agreed
to use the a11y shortcut.

Bug: 70944865
Test: Adding new test for this fragment that checks
this behavior

Change-Id: I7831f64cf3ec59c2d266340cc570227433a4febb

6 years agoMerge "Disable "Mobile data" in "Data usage" if no SIM."
Xiangyu/Malcolm Chen [Sat, 3 Mar 2018 02:42:51 +0000 (02:42 +0000)]
Merge "Disable "Mobile data" in "Data usage" if no SIM."

6 years agoMerge "Add column uid to database"
TreeHugger Robot [Sat, 3 Mar 2018 01:13:50 +0000 (01:13 +0000)]
Merge "Add column uid to database"

6 years agoMerge "Fix switch bar in location settings"
TreeHugger Robot [Sat, 3 Mar 2018 00:37:45 +0000 (00:37 +0000)]
Merge "Fix switch bar in location settings"

6 years agoDisable "Mobile data" in "Data usage" if no SIM.
Malcolm Chen [Thu, 15 Feb 2018 22:40:13 +0000 (14:40 -0800)]
Disable "Mobile data" in "Data usage" if no SIM.

If SIM is taken out, we disable "Mobile data" button in "Data usage"
page.

Bug: 67408951
Test: manual
Change-Id: I9f8937eadd5494f4f7710b9d5431176a13324bdd

6 years agoAdd column uid to database
jackqdyulei [Thu, 1 Mar 2018 00:44:01 +0000 (16:44 -0800)]
Add column uid to database

In database upgrade, reconstruct the database since
it is still empty.

Bug: 74022362
Test: Build
Change-Id: I8d7f7280a7438f371f7e3a2ed1116ba82517d6a6

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 2 Mar 2018 22:17:17 +0000 (22:17 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoFix switch bar in location settings
Maggie [Fri, 2 Mar 2018 17:56:19 +0000 (09:56 -0800)]
Fix switch bar in location settings

When user rotates the device in location settings, the swtich bar with
"Use Location" is gone. This change fixes the problem.

Also, remove override getInitialExpandedChildCount() in
LocationSettings. We will use nested PreferenceCategory instead once the
support is ready.

Bug: 73872033
Bug: 70843646
Test: Manual
Change-Id: I343b549398ef2b3d64ca7962b5f2a4ef0441c7f5

6 years agoMerge "Add OWNERS file in timezone package"
TreeHugger Robot [Fri, 2 Mar 2018 20:26:36 +0000 (20:26 +0000)]
Merge "Add OWNERS file in timezone package"

6 years agoMerge "Fix non-unique keys for location settings"
TreeHugger Robot [Fri, 2 Mar 2018 20:19:36 +0000 (20:19 +0000)]
Merge "Fix non-unique keys for location settings"

6 years agoMerge "Only enable up button if device is provisioned"
TreeHugger Robot [Fri, 2 Mar 2018 20:08:43 +0000 (20:08 +0000)]
Merge "Only enable up button if device is provisioned"

6 years agoTime Zone data loader
Victor Chang [Wed, 28 Feb 2018 13:15:49 +0000 (13:15 +0000)]
Time Zone data loader

- Use CountryZonesFinder to provide time zone id and region-to-timezone
  mapping, where the underlying data is updatable through an unbundled time zone
  data app in some devices.

Bug: 73952488
Bug: 72144448
Test: m RunSettingsRoboTests
Change-Id: I2e01e167c48987ebb98d4881a1a528d16dd82944

6 years agoFix non-unique keys for location settings
Maggie [Fri, 2 Mar 2018 18:39:08 +0000 (10:39 -0800)]
Fix non-unique keys for location settings

Bug: 74104689
Test: Robo
Change-Id: I54ead73b69a6c62897d6b99e14fa5b6627163052

6 years agoOnly enable up button if device is provisioned
Tony Mak [Fri, 2 Mar 2018 18:23:35 +0000 (18:23 +0000)]
Only enable up button if device is provisioned

Test: Carry out QR provisioning, observe that no more back button
      in the nav bar of wifi picker page
Test: After SuW flow,
      Run adb shell am start -a android.net.wifi.PICK_WIFI_NETWORK
      Observe there is a back button in the nav bar.

Change-Id: I50ec5b2c465eee87f5a7906e3353a0070c65e2ee
FIX: 74059636

6 years agoMerge "Move force stop button back out of options menu"
Antony Sargent [Fri, 2 Mar 2018 17:21:06 +0000 (17:21 +0000)]
Merge "Move force stop button back out of options menu"

6 years agoMerge "Fix Ordering Of Work Notifications Settings"
Eric Sandness [Fri, 2 Mar 2018 16:21:50 +0000 (16:21 +0000)]
Merge "Fix Ordering Of Work Notifications Settings"

6 years agoAdd OWNERS file in timezone package
Victor Chang [Fri, 2 Mar 2018 15:16:16 +0000 (15:16 +0000)]
Add OWNERS file in timezone package

Bug: 62255208
Test: Treehugger
Change-Id: I1245007563fb619a3d563e6dcd155544f6baaeef

6 years agoMerge "Revert "Revert "Update to match now slice APIs"""
Alan Viverette [Fri, 2 Mar 2018 15:08:14 +0000 (15:08 +0000)]
Merge "Revert "Revert "Update to match now slice APIs"""

6 years agoFix Ordering Of Work Notifications Settings
Eric Sandness [Fri, 2 Mar 2018 13:02:02 +0000 (13:02 +0000)]
Fix Ordering Of Work Notifications Settings

The work notification settings were previously moved to the bottom of
the notification settings screen, but subsequent changes have caused
them to appear near the top again.  Move them back to the bottom.

Fixes: 64436619
Test: Open Settings app manually with and without a work profile
Change-Id: I90a03eb5c018a7684329e395da027a2f736516eb

6 years agoSettings: app&notification children count increase
mcwilliams [Fri, 2 Mar 2018 00:01:13 +0000 (00:01 +0000)]
Settings: app&notification children count increase

Sunshine is injecting App Usage stats into settings within Apps &
Notifications. Increase the children count to accomodate the extra
entity.

Bug: 74066149
Test: make -j56 RunSettingsRoboTests
Change-Id: I54ca06c942fbdf4e7451f6ed22f6f811b8a67747

6 years agoMerge "Update layout for app preference"
TreeHugger Robot [Fri, 2 Mar 2018 03:07:00 +0000 (03:07 +0000)]
Merge "Update layout for app preference"

6 years agoUpdate layout for app preference
Fan Zhang [Fri, 2 Mar 2018 01:46:55 +0000 (17:46 -0800)]
Update layout for app preference

The summary and appendix string each takes 50% of horizontal space so
they don't push the other too far off.

Change-Id: I89d859f1ec46340695aa0ef75e4c81e6435b151a
Fixes: 74028565
Test: visual

6 years agoAdd a default preference controller for developer options.
Doris Ling [Thu, 1 Mar 2018 23:33:05 +0000 (15:33 -0800)]
Add a default preference controller for developer options.

- some of the preferences in the developer options page do not have a
preference controller associated with them, because they are simple
preference that do not require any update on the preference state at
all. However, they still need to be enabled/disabled when the master
developer options switch is turned on/off. Adding a default controller
to be used for these preferences.

Bug: 73955632
Test: manual
Change-Id: Ifb757dee2e5957d266ebb6ad5421d8ff9adbb142

6 years agoMerge "Support Slice type in SliceData"
TreeHugger Robot [Fri, 2 Mar 2018 00:48:08 +0000 (00:48 +0000)]
Merge "Support Slice type in SliceData"

6 years agoMove force stop button back out of options menu
Antony Sargent [Thu, 1 Mar 2018 18:37:41 +0000 (10:37 -0800)]
Move force stop button back out of options menu

In ag/3485781 we moved the force stop button up into the options
menu, but it turns out we didn't actually want to do that. This
CL reverts that change.

Bug: 72948647
Test: make RunSettingsRoboTests
Change-Id: Id687dbde378dc9d95d88a9c188762094d05b6561

6 years agoMerge "Reduce max suggestion to show to 2."
Doris Ling [Thu, 1 Mar 2018 23:48:55 +0000 (23:48 +0000)]
Merge "Reduce max suggestion to show to 2."

6 years agoMerge "Remove unnecessary onDeveloperOptionsSwitchEnabled/Disabled override."
TreeHugger Robot [Thu, 1 Mar 2018 23:35:45 +0000 (23:35 +0000)]
Merge "Remove unnecessary onDeveloperOptionsSwitchEnabled/Disabled override."

6 years agoSupport Slice type in SliceData
Matthew Fritze [Wed, 28 Feb 2018 00:35:40 +0000 (16:35 -0800)]
Support Slice type in SliceData

Add a getter for Slice type for BasePreferenceController.
This facilitates the generation of all possible Slices for Settings
search and discovery for AGSA.

Bug: 62807132
Test: robotests
Change-Id: I2cba1fc72c95769ecc26c76d1f2faa49a285d077

6 years agoMerge "Add a preview image to the color mode preference."
Sean Callanan [Thu, 1 Mar 2018 22:39:23 +0000 (22:39 +0000)]
Merge "Add a preview image to the color mode preference."

6 years agoMerge "Gateway whitelist AdvancedConnectedDeviceDashboardFragment"
TreeHugger Robot [Thu, 1 Mar 2018 22:33:30 +0000 (22:33 +0000)]
Merge "Gateway whitelist AdvancedConnectedDeviceDashboardFragment"

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 1 Mar 2018 22:23:13 +0000 (14:23 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I22bc99cc231771403dd9be9ec77fa0391e4e874d

6 years agoReduce max suggestion to show to 2.
Doris Ling [Fri, 23 Feb 2018 22:59:41 +0000 (14:59 -0800)]
Reduce max suggestion to show to 2.

- since we now either have 1 or 2 suggestions, putting most layout
configuration in the xml instead of dynamically setting it in code.
- remove the suggestion header
- vertical center align the suggestion title text for 2 cards to make
the card with single line looks better.
- tint all suggestions icons.

Change-Id: I0130f15d530264e164e5afd7c091f165a4a6adc2
Fixes: 70573674
Fixes: 73293989
Fixes: 64986736
Test: visual and make RunSettingsRoboTests

6 years agoMerge "Bluetooth: Use config value for default max connected audio devices" am: 57f8e...
Jack He [Thu, 1 Mar 2018 21:59:07 +0000 (21:59 +0000)]
Merge "Bluetooth: Use config value for default max connected audio devices" am: 57f8e717c7  -s ours am: 786fa66b6d
am: 6852928a75  -s ours

Change-Id: I5b67825bd9ff42bc467b078225630f4bafa7de2c

6 years agoRemove unnecessary onDeveloperOptionsSwitchEnabled/Disabled override.
Doris Ling [Thu, 1 Mar 2018 18:33:14 +0000 (10:33 -0800)]
Remove unnecessary onDeveloperOptionsSwitchEnabled/Disabled override.

- default implementation has been added in the super class to handle
enabling/disabling the preference when the master developer options
switch it turned on/off. Removing all subclass that originally
implemented the methods that only contains the default behavior.

Bug: 73955632
Test: make RunSettingsRoboTests
Change-Id: I13c372c2ab498a5786b40cdc1ad3b5f3424abb5a

6 years agoMerge "Bluetooth: Use config value for default max connected audio devices" am: 57f8e...
Jack He [Thu, 1 Mar 2018 21:44:28 +0000 (21:44 +0000)]
Merge "Bluetooth: Use config value for default max connected audio devices" am: 57f8e717c7  -s ours
am: 786fa66b6d

Change-Id: Ibec2e409300f36f36f2ec005233d32bd4c712e51

6 years agoMerge "Bluetooth: Use config value for default max connected audio devices"
Jack He [Thu, 1 Mar 2018 21:40:20 +0000 (21:40 +0000)]
Merge "Bluetooth: Use config value for default max connected audio devices"
am: 57f8e717c7  -s ours

Change-Id: I9b6e16237723c8a5903d011d2ee6a948c4f3ed47

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 1 Mar 2018 21:27:27 +0000 (13:27 -0800)]
Import translations. DO NOT MERGE

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

6 years agoGateway whitelist AdvancedConnectedDeviceDashboardFragment
Fan Zhang [Thu, 1 Mar 2018 17:49:34 +0000 (09:49 -0800)]
Gateway whitelist AdvancedConnectedDeviceDashboardFragment

- Discovered a few more fragments that weren't whitelisted, so I
  whistlisted those as well.
- Also found ZenModeExternalRuleSettings is misconfigured in manifest
  and no longer needed, so deleted all artifacts about this activity.

Fixes: 74060141
Test:  atest
Change-Id: I159e403bfa6707e2939d075ecc2b8d2f13514153

6 years agoAdd a preview image to the color mode preference.
Sean Callanan [Wed, 21 Feb 2018 02:57:29 +0000 (18:57 -0800)]
Add a preview image to the color mode preference.

For high-color displays, it's desirable to have a preview of the
impact the user's color preference will have on images.  This commit
adds that functionality to ColorModePreferenceFragment by extending
RadioButtonPickerFragment to support static content.

The image used here is a placeholder pending UX.

Bug: 73670362
Test: Added a test verifying that the preview is added correctly.
Change-Id: Id54316bbef6a22291a8e8acbda5fcb2839b88c23

6 years agoMerge "Bluetooth: Use config value for default max connected audio devices"
Treehugger Robot [Thu, 1 Mar 2018 19:34:20 +0000 (19:34 +0000)]
Merge "Bluetooth: Use config value for default max connected audio devices"

6 years agoMerge "Adding Wifi setting to special_access settings"
Oscar Shu [Thu, 1 Mar 2018 17:20:50 +0000 (17:20 +0000)]
Merge "Adding Wifi setting to special_access settings"

6 years agoMerge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible."
Anton Hansson [Thu, 1 Mar 2018 10:26:48 +0000 (10:26 +0000)]
Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible."

6 years agoMerge "ChooseLockPassword should not show "confirm" until min length is met"
TreeHugger Robot [Thu, 1 Mar 2018 04:45:25 +0000 (04:45 +0000)]
Merge "ChooseLockPassword should not show "confirm" until min length is met"

6 years agoMerge "Bluetooth: Use config value for default max connected audio devices"
TreeHugger Robot [Thu, 1 Mar 2018 03:25:41 +0000 (03:25 +0000)]
Merge "Bluetooth: Use config value for default max connected audio devices"

6 years agoMerge "ChooseLockPassword shows wrong string when confirmed password is wrong"
Kevin Chyn [Thu, 1 Mar 2018 03:02:00 +0000 (03:02 +0000)]
Merge "ChooseLockPassword shows wrong string when confirmed password is wrong"

6 years agoBluetooth: Use config value for default max connected audio devices
Jack He [Tue, 27 Feb 2018 06:58:56 +0000 (22:58 -0800)]
Bluetooth: Use config value for default max connected audio devices

* The first option in Bluetooth max connected audio devices preference
  should be using system default
* Added template based string array to show system default in the list
  preference and in preference summary when default is chosen
* Reset max connected audio devices property to empty string when
  development setting is disabled or when system default is chosen
* Fix a bug by saving selected value to list preference so that it
  persists when user re-opens development settings

Bug: 64767509
Test: Enable and disable multi-device mode in development settings
Change-Id: I4915f12df0ac0e6f715e44e0df4a3707dde8d1a4
Merged-In: I4915f12df0ac0e6f715e44e0df4a3707dde8d1a4

6 years agoBluetooth: Use config value for default max connected audio devices
Jack He [Wed, 28 Feb 2018 00:42:57 +0000 (16:42 -0800)]
Bluetooth: Use config value for default max connected audio devices

* The first option in Bluetooth max connected audio devices preference
  should be using system default
* Added template based string array to show system default in the list
  preference and in preference summary when default is chosen
* Reset max connected audio devices property to empty string when
  development setting is disabled or when system default is chosen
* Added instrumentation test to check preference array size and whether
  default value is within range of preference array values
* Modified robolectric tests to verify the updated behaviors

Bug: 64767509
Test: Enable and disable multi-device mode in development settings
      make -j32 RunSettingsRoboTests
      atest SettingsUnitTests:BluetoothMaxConnectedAudioDevicesPreferenceControllerInstrumentationTest
Change-Id: I4915f12df0ac0e6f715e44e0df4a3707dde8d1a4

6 years agoChooseLockPassword should not show "confirm" until min length is met
Kevin Chyn [Thu, 1 Mar 2018 01:52:34 +0000 (17:52 -0800)]
ChooseLockPassword should not show "confirm" until min length is met

Fixes: 70561465

Test: manual test with setting pin/pw
Change-Id: I545202f508fa7b1a73b9a2e66a8f8216deba7555

6 years agoMerge "Auto update summary for mobile network preference."
TreeHugger Robot [Thu, 1 Mar 2018 01:42:32 +0000 (01:42 +0000)]
Merge "Auto update summary for mobile network preference."

6 years agoMerge "Remove custom updateState() if it's just setting summary"
TreeHugger Robot [Thu, 1 Mar 2018 01:29:22 +0000 (01:29 +0000)]
Merge "Remove custom updateState() if it's just setting summary"

6 years agoChooseLockPassword shows wrong string when confirmed password is wrong
Kevin Chyn [Thu, 1 Mar 2018 01:28:15 +0000 (17:28 -0800)]
ChooseLockPassword shows wrong string when confirmed password is wrong

Fixes: 70561469

Test: try to setup a password/pin, but type in a wrong pw/pin
      when confirming. the button should stay as "confirm" instead of
      reverting to "next"

Change-Id: Iea570c2d869b9d561b26046d30d08f40abca0c93

6 years agoMerge "Under "recent location requests", add "See all""
TreeHugger Robot [Wed, 28 Feb 2018 23:46:32 +0000 (23:46 +0000)]
Merge "Under "recent location requests", add "See all""

6 years agoMerge "Update tests for string changes"
TreeHugger Robot [Wed, 28 Feb 2018 23:22:30 +0000 (23:22 +0000)]
Merge "Update tests for string changes"

6 years agoAuto update summary for mobile network preference.
Fan Zhang [Wed, 28 Feb 2018 22:06:11 +0000 (14:06 -0800)]
Auto update summary for mobile network preference.

Change-Id: Ic7854ef4d2d710dff528244a5e5fb75708740d2e
Fixes: 73504707
Test: robotests

6 years agoRemove custom updateState() if it's just setting summary
Fan Zhang [Wed, 28 Feb 2018 01:12:26 +0000 (17:12 -0800)]
Remove custom updateState() if it's just setting summary

Change-Id: I6311d67d6ba11961a6814b91dcd8e37a2e17df40
Fixes: 73950519
Test: rerun robotests

6 years agoUnder "recent location requests", add "See all"
Maggie [Sat, 27 Jan 2018 00:30:17 +0000 (16:30 -0800)]
Under "recent location requests", add "See all"

Under Settings -> Security & Location -> Location, add "See all" button
under recent location requests

On location settings page, display at most 3 recent location requests.
If there are more than 3, show a "see all" button.
When user clicks "See all", take them to a new fragment with all recent
location requests.

Test: Robo
Test: Manual
Bug: 70350519
Change-Id: Id1f9a8da1593814a8f30f8e6ec8ac75fb10f6672

6 years agoMerge "Add summary for Display->Color settings."
TreeHugger Robot [Wed, 28 Feb 2018 20:52:27 +0000 (20:52 +0000)]
Merge "Add summary for Display->Color settings."

6 years agoMerge "Force shortcuts to launch as the root of a new task"
TreeHugger Robot [Wed, 28 Feb 2018 20:27:32 +0000 (20:27 +0000)]
Merge "Force shortcuts to launch as the root of a new task"

6 years agoMerge "Fix crash when launching about phone v2 through intent"
TreeHugger Robot [Wed, 28 Feb 2018 19:37:57 +0000 (19:37 +0000)]
Merge "Fix crash when launching about phone v2 through intent"

6 years agoAdd summary for Display->Color settings.
Doris Ling [Tue, 27 Feb 2018 00:09:51 +0000 (16:09 -0800)]
Add summary for Display->Color settings.

Change-Id: Ia1332b4e3333099878ee52342c64b3d8595fdd94
Fixes: 73773857
Test: make RunSettingsRoboTests

6 years agoForce shortcuts to launch as the root of a new task
Fan Zhang [Wed, 28 Feb 2018 19:12:05 +0000 (11:12 -0800)]
Force shortcuts to launch as the root of a new task

Otherwise it will try to find a existing task affinity, which can be
stale.

Test: manual
Change-Id: If2982612bf8789e726757e9fda1f70af47274a9e
Fixes: 73710228

6 years agoUpdate tests for string changes
Salvador Martinez [Wed, 28 Feb 2018 18:23:58 +0000 (10:23 -0800)]
Update tests for string changes

Some tests were validating strings for enhanced estimates. Since
those strings have been updated the tests in Settings need to be
updated to reflect those changes.

Test: Is a test change
Bug: 73290523
Bug: 72996609
Bug: 73904361
Change-Id: I5a175eb89539544bc10647a5373bd064efa3dbf7

6 years agoFix crash when launching about phone v2 through intent
Fan Zhang [Wed, 28 Feb 2018 18:03:43 +0000 (10:03 -0800)]
Fix crash when launching about phone v2 through intent

Change-Id: Ife6c24a7127fc9821760f9f5b58a33437711bc25
Fixes: 73971752
Test: atest

6 years agoMerge "Remove duplicate test"
TreeHugger Robot [Wed, 28 Feb 2018 18:03:14 +0000 (18:03 +0000)]
Merge "Remove duplicate test"

6 years agoMerge "Fixed failing launch of Data usage activty from data saver suggestion."
Jan Nordqvist [Wed, 28 Feb 2018 17:21:16 +0000 (17:21 +0000)]
Merge "Fixed failing launch of Data usage activty from data saver suggestion."

6 years agopackages/apps/Settings: Set LOCAL_SDK_VERSION where possible.
Anton Hansson [Wed, 28 Feb 2018 11:26:29 +0000 (11:26 +0000)]
packages/apps/Settings: Set LOCAL_SDK_VERSION where possible.

This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.

Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.

Test: make relevant packages
Bug: 73535841
Change-Id: I8dbe76fee202a571b1492b598035cc7b92e4433f

6 years agoMerge "Fix not delivering result to fragment using SubSettingLauncher"
Victor Chang [Wed, 28 Feb 2018 10:59:36 +0000 (10:59 +0000)]
Merge "Fix not delivering result to fragment using SubSettingLauncher"

6 years agoMerge "Change PreferenceController#getSummary return type."
TreeHugger Robot [Wed, 28 Feb 2018 08:40:29 +0000 (08:40 +0000)]
Merge "Change PreferenceController#getSummary return type."

6 years agoChange PreferenceController#getSummary return type.
Fan Zhang [Tue, 27 Feb 2018 18:30:11 +0000 (10:30 -0800)]
Change PreferenceController#getSummary return type.

Return CharSequence instead of String.

All user visible string should be modeled as CharSequence.

Bug: 73950519
Test: robotest
Change-Id: I30befef0c33f94351d4a2774e283bd1ed804aa8b

6 years agoMerge changes I06df032d,Ib923de28 am: 59a548b940 am: 34f43b50ce
Andreas Gampe [Wed, 28 Feb 2018 05:16:29 +0000 (05:16 +0000)]
Merge changes I06df032d,Ib923de28 am: 59a548b940 am: 34f43b50ce
am: fd99b8b009  -s ours

Change-Id: I0eab3f2bdcbacb8a4fc3bc4d171299c74c806c56

6 years agoMerge changes I06df032d,Ib923de28 am: 59a548b940
Andreas Gampe [Wed, 28 Feb 2018 04:51:14 +0000 (04:51 +0000)]
Merge changes I06df032d,Ib923de28 am: 59a548b940
am: 34f43b50ce

Change-Id: I0bb87911c11685bcc8caa58d5a3ce9cf044e4ee1

6 years agoMerge changes I06df032d,Ib923de28
Andreas Gampe [Wed, 28 Feb 2018 04:37:06 +0000 (04:37 +0000)]
Merge changes I06df032d,Ib923de28
am: 59a548b940

Change-Id: I4d1314379ba77c07b64c3ca5c77a61f9a54d4c1d

6 years agoMerge changes I06df032d,Ib923de28
Treehugger Robot [Wed, 28 Feb 2018 03:34:13 +0000 (03:34 +0000)]
Merge changes I06df032d,Ib923de28

* changes:
  Settings: Disable failing tests.
  Settings: Fix assertThat in tests

6 years agoMerge "rename emergency tone settings" am: 2054a4d6d4 am: eb664426c5
Chen Xu [Wed, 28 Feb 2018 02:49:11 +0000 (02:49 +0000)]
Merge "rename emergency tone settings" am: 2054a4d6d4 am: eb664426c5
am: 648d302ba7

Change-Id: I5edb5cf7b20b022b2a2514ec96bf99e38cf2c007

6 years agoMerge "rename emergency tone settings" am: 2054a4d6d4
Chen Xu [Wed, 28 Feb 2018 02:43:59 +0000 (02:43 +0000)]
Merge "rename emergency tone settings" am: 2054a4d6d4
am: eb664426c5

Change-Id: I9c4bd1ae9ac8c13732686949ce316c7abf8e5c75

6 years agoMerge "rename emergency tone settings"
Chen Xu [Wed, 28 Feb 2018 02:38:23 +0000 (02:38 +0000)]
Merge "rename emergency tone settings"
am: 2054a4d6d4

Change-Id: I106fc98ae0dab79e5e8bc9b5ec10c3810a440aaa

6 years agoSettings: Disable failing tests.
Andreas Gampe [Mon, 26 Feb 2018 20:22:29 +0000 (12:22 -0800)]
Settings: Disable failing tests.

Temporarily disable.

(cherry picked from commit b506fb9b1918fe4b2144339567862ff03b3942cc)

Bug: 73892008
Test: m RunSettingsRoboTests
Exempt-From-Owner-Approval: Cherrypick
Merged-In: I06df032d4a4de84c2f9f46e5086d97f688b0c989
Change-Id: I06df032d4a4de84c2f9f46e5086d97f688b0c989

6 years agoMerge "rename emergency tone settings"
Chen Xu [Wed, 28 Feb 2018 02:17:26 +0000 (02:17 +0000)]
Merge "rename emergency tone settings"

6 years agoSettings: Fix assertThat in tests
Andreas Gampe [Mon, 26 Feb 2018 19:28:21 +0000 (11:28 -0800)]
Settings: Fix assertThat in tests

Truth.assertThat is a fluent-style API. Fix the tests to actually
do something.

Found by errorprone.

(cherry picked from commit 22bad556a1863bff80c4ec517ada315f7b01890e)

Bug: 73513670
Test: m RunSettingsRoboTests
Test: m javac-check RUN_ERROR_PRONE=true
Exempt-From-Owner-Approval: Cherrypick
Merged-In: Ib923de28ce5dcf79b9dec718306877e31e58e024
Change-Id: Ib923de28ce5dcf79b9dec718306877e31e58e024

6 years agoMerge "Fix search non-indexable update"
TreeHugger Robot [Wed, 28 Feb 2018 02:09:21 +0000 (02:09 +0000)]
Merge "Fix search non-indexable update"

6 years agoRemove duplicate test
Salvador Martinez [Wed, 28 Feb 2018 01:43:12 +0000 (17:43 -0800)]
Remove duplicate test

PowerUsageSummary was duplicated to have the old version exist
in developer options. This test is for a debug feature which will
not be released so there is no point in having a duplicate of it
as well. This CL removes that test.

Test: Is a test CL
Bug: 73513677
Change-Id: Ia3ed704018cfaa0b05c4bf0f2799ff8151ba4b85

6 years agoMerge "Remove unused classes and tests."
TreeHugger Robot [Wed, 28 Feb 2018 00:42:28 +0000 (00:42 +0000)]
Merge "Remove unused classes and tests."

6 years agoFix search non-indexable update
Fan Zhang [Wed, 28 Feb 2018 00:05:02 +0000 (16:05 -0800)]
Fix search non-indexable update

- When creating preference conotrollers, if one fail, skip that one
  instead of giving up entire operation.
- Fix BatterySaverController by providing a existing looper.

Change-Id: Iefe443b7fa91e51515c5c247fab4d9588867baef
Fixes: 73903739
Test: robotest

6 years agoMerge "Fix the AnomalyCleanUpJobService"
Lei Yu [Wed, 28 Feb 2018 00:13:37 +0000 (00:13 +0000)]
Merge "Fix the AnomalyCleanUpJobService"

6 years agoMerge "Add logging for battery tip"
TreeHugger Robot [Tue, 27 Feb 2018 23:39:33 +0000 (23:39 +0000)]
Merge "Add logging for battery tip"

6 years agoMerge "Add metric for BatteryTipDialogFragmnt"
TreeHugger Robot [Tue, 27 Feb 2018 23:39:33 +0000 (23:39 +0000)]
Merge "Add metric for BatteryTipDialogFragmnt"

6 years agorename emergency tone settings
fionaxu [Tue, 27 Feb 2018 23:14:57 +0000 (15:14 -0800)]
rename emergency tone settings

Bug: 67470733
Test: Manual
Change-Id: I67e223c2db662f518fa306221190d4646668c4d3

6 years agoRevert "Revert "Update to match now slice APIs""
Alan Viverette [Tue, 27 Feb 2018 22:10:26 +0000 (22:10 +0000)]
Revert "Revert "Update to match now slice APIs""

This reverts commit 80c806abd60f8d8381f6654fd2f708f5d915f0bf.

Bug: 73250914
Test: make && make checkbuild, manual testing

6 years agoMerge "Revert "Update to match now slice APIs""
Alan Viverette [Tue, 27 Feb 2018 22:08:31 +0000 (22:08 +0000)]
Merge "Revert "Update to match now slice APIs""