OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoFor vibration settings page, create controllers from xml
Fan Zhang [Wed, 7 Mar 2018 22:15:28 +0000 (14:15 -0800)]
For vibration settings page, create controllers from xml

This change leverages a new support in settings framework to
automatically share preference controllers between full setting page,
search, and slice provider.

Bug: 73668763
Test: existing robotest and atest
Change-Id: Ie96a28f1b503377b3fdf86e28d297c8560d8bf71

6 years agoClean up comment
Fan Zhang [Wed, 7 Mar 2018 21:36:58 +0000 (13:36 -0800)]
Clean up comment

Bug: 73074893
Test: none
Change-Id: If7dcfcbb2e943d5734239ddb51c0e6ac798b641b

6 years agoMerge "Enable new time zone picker" into pi-dev
Victor Chang [Wed, 7 Mar 2018 17:09:59 +0000 (17:09 +0000)]
Merge "Enable new time zone picker" into pi-dev

6 years agoMerge "New time zone picker page" into pi-dev
Victor Chang [Wed, 7 Mar 2018 17:09:59 +0000 (17:09 +0000)]
Merge "New time zone picker page" into pi-dev

6 years agoMerge "Update dabase manager to store the uid" into pi-dev
TreeHugger Robot [Wed, 7 Mar 2018 16:57:35 +0000 (16:57 +0000)]
Merge "Update dabase manager to store the uid" into pi-dev

6 years agoMerge "System gets its own dnd toggle" into pi-dev
TreeHugger Robot [Wed, 7 Mar 2018 16:39:40 +0000 (16:39 +0000)]
Merge "System gets its own dnd toggle" into pi-dev

6 years agoEnable new time zone picker
Victor Chang [Wed, 28 Feb 2018 19:43:03 +0000 (19:43 +0000)]
Enable new time zone picker

- Change the UI test due to UI changes

Bug: 73952488
Test: m RunSettingsRoboTest
Test: atest SettingsUITests:ZonePickerSettingsTest
Change-Id: I6d5716347e9debf429b757f1edd4118e86b70fab
(cherry picked from commit 335c0621d2521d3801c13dafdbfc2e632d171104)

6 years agoNew time zone picker page
Victor Chang [Wed, 28 Feb 2018 19:37:36 +0000 (19:37 +0000)]
New time zone picker page

- Show current selected region and time zone in a 2 rows.
  Defailed info of current selected time zone in footer
- Show option menu to switch to select UTC offset
- This picker will be changed to the default picker in a later CL

Bug: 73952488
Test: m RunSettingsRoboTests
Change-Id: Ia81bb022e1021369612f5bd60c2c1f4d08db2af8
(cherry picked from commit b7d588f3415310c91313e4d0481f63edbfddbce3)

6 years agoCatch SecurityException from enabling backup activity
Bernardo Rufino [Tue, 6 Mar 2018 16:07:13 +0000 (16:07 +0000)]
Catch SecurityException from enabling backup activity

Cases where the activity is already enabled and the account is an unicorn
account.

Test: Opened activity from backup settings w/ unicorn account, verified
      no crash
Bug: 74199770
Change-Id: I7dc30d22b186ff19cf7c40fda0363ff1288224d1

6 years agoUpdate dabase manager to store the uid
jackqdyulei [Thu, 1 Mar 2018 00:49:25 +0000 (16:49 -0800)]
Update dabase manager to store the uid

Also update the AppInfo to store the uid

Bug: 74022362
Test: RunSettingsRoboTests
Change-Id: I373242a12e9dbf48be134f2e9be30831b09f91c9

6 years agoMerge "Add SettingsMultiSelectListPreference style" into pi-dev
TreeHugger Robot [Wed, 7 Mar 2018 03:47:20 +0000 (03:47 +0000)]
Merge "Add SettingsMultiSelectListPreference style" into pi-dev

6 years agoMerge "Add strings for audio output switcher." into pi-dev
TreeHugger Robot [Wed, 7 Mar 2018 03:42:13 +0000 (03:42 +0000)]
Merge "Add strings for audio output switcher." into pi-dev

6 years agoMerge changes from topic "tip_new_page-pi-dev" into pi-dev
TreeHugger Robot [Wed, 7 Mar 2018 03:40:50 +0000 (03:40 +0000)]
Merge changes from topic "tip_new_page-pi-dev" into pi-dev

* changes:
  Hook up the new page to PowerUsageSummary
  Create new PowerUsageAdvanced page
  Change current PowerUsageAdvanced to legacy code

6 years agoMerge "Add auto restriction preference" into pi-dev
TreeHugger Robot [Wed, 7 Mar 2018 02:32:17 +0000 (02:32 +0000)]
Merge "Add auto restriction preference" into pi-dev

6 years agoAdd SettingsMultiSelectListPreference style
Yoshinori Hirano [Mon, 30 Oct 2017 05:38:57 +0000 (14:38 +0900)]
Add SettingsMultiSelectListPreference style

There is no OK and CANCEL button when changing APN Bearer.
To fix this issue, OK and CANCEL button should be added to
SettingsMultiSelectListPreference style.

Fixes: 66928311
Test: manual - Add a new APN and tap Bearer

Change-Id: I2b5719a7c1fdb721b15308e0eef7db3e6398e097

6 years agoMerge "Stop wrapping RoundedHomepageIcon if it's already wrapped." into pi-dev
TreeHugger Robot [Wed, 7 Mar 2018 01:21:20 +0000 (01:21 +0000)]
Merge "Stop wrapping RoundedHomepageIcon if it's already wrapped." into pi-dev

6 years agoHook up the new page to PowerUsageSummary
jackqdyulei [Tue, 27 Feb 2018 22:58:06 +0000 (14:58 -0800)]
Hook up the new page to PowerUsageSummary

Add a menu to point to the new page

Bug: 73300636
Test: RunSettingsRoboTests
Change-Id: I9956e349cdbbe2cd752bdf65020a540a329bdee3
Merged-In: I9956e349cdbbe2cd752bdf65020a540a329bdee3

6 years agoMerge "Add intent fields when launching instant app." into pi-dev
TreeHugger Robot [Wed, 7 Mar 2018 00:59:20 +0000 (00:59 +0000)]
Merge "Add intent fields when launching instant app." into pi-dev

6 years agoCreate new PowerUsageAdvanced page
jackqdyulei [Tue, 27 Feb 2018 22:30:57 +0000 (14:30 -0800)]
Create new PowerUsageAdvanced page

This page contains the graph at the top and app list at the bottom

In this cl, we reused some part of the code in PowerUsageAdvancedLegacy
to construct the graph, and also used controller to construct the app
list(So glad that we extracted it to controller before..)

Bug: 73300636
Test: RunSettingsRoboTests
Change-Id: I30afbc0327a5186f8280f5e3678330b363e2dc0d
Merged-In: I30afbc0327a5186f8280f5e3678330b363e2dc0d

6 years agoChange current PowerUsageAdvanced to legacy code
jackqdyulei [Tue, 27 Feb 2018 22:12:32 +0000 (14:12 -0800)]
Change current PowerUsageAdvanced to legacy code

In future cl, we will create new PowerUsageAdvanced page.

Bug: 73300636
Test: Build
Change-Id: I608f6b1fb9bf29a6ef5d7f9d67bcb6eea9e7aec7
Merged-In: I608f6b1fb9bf29a6ef5d7f9d67bcb6eea9e7aec7

6 years agoAdd strings for audio output switcher.
Doris Ling [Tue, 6 Mar 2018 23:15:01 +0000 (15:15 -0800)]
Add strings for audio output switcher.

Bug: 74130772
Test: rebuild
Change-Id: I84b702b69cc0cd23caeebb441ad8310b56441b5b

6 years agoStop wrapping RoundedHomepageIcon if it's already wrapped.
Fan Zhang [Tue, 6 Mar 2018 22:16:08 +0000 (14:16 -0800)]
Stop wrapping RoundedHomepageIcon if it's already wrapped.

On homepage, if an icon is already wrapped in RoundedHomepageIcon, we
shouldn't wrap it more. Otherwise each time we do this it will add a few
dp padding around the bitmap.

Change-Id: I5313a38f4bd128272d7b4e05209aaee72c690c55
Fixes: 73295342
Test: robotest

6 years agoMerge "Fix crash in battery info settings page." into pi-dev
TreeHugger Robot [Tue, 6 Mar 2018 22:47:15 +0000 (22:47 +0000)]
Merge "Fix crash in battery info settings page." into pi-dev

6 years agoMerge "Time zone, Region, UTC picker" into pi-dev
Victor Chang [Tue, 6 Mar 2018 22:01:35 +0000 (22:01 +0000)]
Merge "Time zone, Region, UTC picker" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 6 Mar 2018 21:59:34 +0000 (21:59 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoAdd intent fields when launching instant app.
Doris Ling [Tue, 6 Mar 2018 21:37:21 +0000 (13:37 -0800)]
Add intent fields when launching instant app.

- add browseable category, package name, and new task flag.

Change-Id: Ie558f5885b5f0f78c88241de7c2d7a21cfb9d0fe
Fixes: 74131502
Test: make RunSettingsRoboTests

6 years agoAdd auto restriction preference
jackqdyulei [Tue, 6 Mar 2018 18:28:29 +0000 (10:28 -0800)]
Add auto restriction preference

1. Add method in feature provider to check whether smart battery
is supported
2. Hook up above method to controllers
3. Add auto restriction preference
4. Add tests

Bug: 73002171
Test: RunSettingsRoboTests
Change-Id: Ic314f61ad52e9bedb629b308731cb968bb4b1773
Merged-In: Ic314f61ad52e9bedb629b308731cb968bb4b1773
(cherry picked from commit ab0b0add0a9b7409db016b0f1561612c16173fbd)

6 years agoMerge "Change encryption preference's summary accordingly" into pi-dev
TreeHugger Robot [Tue, 6 Mar 2018 21:31:07 +0000 (21:31 +0000)]
Merge "Change encryption preference's summary accordingly" into pi-dev

6 years agoMerge "Create a new list when building suggestion data." into pi-dev
Doris Ling [Tue, 6 Mar 2018 21:09:24 +0000 (21:09 +0000)]
Merge "Create a new list when building suggestion data." into pi-dev

6 years agoFix crash in battery info settings page.
Doris Ling [Tue, 6 Mar 2018 19:36:54 +0000 (11:36 -0800)]
Fix crash in battery info settings page.

- when receive package updates, check if the buttons preference is
available before trying to update the UI.

Change-Id: Ie3482b94c84cd55e9a138af4719a031f5167e089
Fixes: 74130214
Test: make RunSettingsRoboTests

6 years agoMerge "Update pref fragment for "see all" in app & notification" into pi-dev
TreeHugger Robot [Tue, 6 Mar 2018 20:05:33 +0000 (20:05 +0000)]
Merge "Update pref fragment for "see all" in app & notification" into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 6 Mar 2018 19:59:37 +0000 (11:59 -0800)]
Import translations. DO NOT MERGE

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

6 years agoChange encryption preference's summary accordingly
Alex Cruz [Fri, 20 Oct 2017 23:26:58 +0000 (19:26 -0400)]
Change encryption preference's summary accordingly

With this change a summary to the encryption preference was added.

https://android.googlesource.com/platform/packages/apps/Settings/+/415ce9a77d44732966fbab641d1ecaa8e8688381

The problem is that even if you're not encrypted, it says that your phone is.
Is very misleading to the user that don't bother to enter the actual preference
and want to see if they are. This fixes that.

This is cherry-picked from
https://android-review.googlesource.com/#/c/platform/packages/apps/Settings/+/517875/

Test: Go into Settings/Security & Location
Fixes: 68691666
Fixes: 68542516
Change-Id: Iaeaffd340f2e248748f244a947aa71eb8ad4ab94

6 years agoMerge "Make "Action not allowed" dialog compliant with Material Spec and replace...
Antoan Angelov [Tue, 6 Mar 2018 19:37:52 +0000 (19:37 +0000)]
Merge "Make "Action not allowed" dialog compliant with Material Spec and replace full screen activities with the dialog." into pi-dev

6 years agoMerge "Fix SettingsRoboTests build error with OpenJDK 9" into pi-dev
TreeHugger Robot [Tue, 6 Mar 2018 19:24:48 +0000 (19:24 +0000)]
Merge "Fix SettingsRoboTests build error with OpenJDK 9" into pi-dev

6 years agoCreate a new list when building suggestion data.
Doris Ling [Tue, 6 Mar 2018 18:55:40 +0000 (10:55 -0800)]
Create a new list when building suggestion data.

- using sublist of the original suggestions list may results in
ConcurrentModificationException if the originaly list is being modified.
Create a new list instead to avoid running into the issue.

Change-Id: Ia83a0432be542eeb428d177f6118d26fc2262e93
Fixes: 74194336
Test: run monkey

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 agoUpdate pref fragment for "see all" in app & notification
Fan Zhang [Mon, 5 Mar 2018 22:22:46 +0000 (14:22 -0800)]
Update pref fragment for "see all" in app & notification

Instead of launching intent, now to launches all app list as a
subsetting. This is more consistent with the other setting pages and
fixes a task affinity issue.

Change-Id: I0464a2b8f46d46f06bcf297c0f876ae12a7c490b
Fixes: 74205806
Test: robotests

6 years agoSystem gets its own dnd toggle
Beverly [Fri, 16 Feb 2018 19:33:37 +0000 (14:33 -0500)]
System gets its own dnd toggle

Test: make ROBOTEST_FILTER=ZenModeSystemPreferenceControllerTest RunSettingsRoboTests -j40
Bug: 73362490
Change-Id: Id5212665da8c820fc070676ff034dbe67510ea5d

6 years agoTime zone, Region, UTC picker
Victor Chang [Wed, 28 Feb 2018 19:31:31 +0000 (19:31 +0000)]
Time zone, Region, UTC picker

- Extract most common view related codes into BaseTimeZoneAdapter
  and BaseTimeZonePicker. Subclass handles the text formatting and
  order.
- Search view is added compared to previous version of time
  zone picker
- SpannableUtil is added to preserve spannable when formatting
  String resource.
- Fix the bug using GMT+<arabic> as time zone id. b/73132985
- Fix Talkback treating flags on screens as a separate element

Bug: 72146259
Bug: 73132985
Bug: 73952488
Test: mm RunSettingsRoboTests
Change-Id: I42c6ac369199c09d11e7f5cc4707358fa4780fed
(cherry picked from commit fbd30acef09d1db6aaf767c2bcbb17787fd08ba1)

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 agoMake "Action not allowed" dialog compliant with Material Spec and replace full screen...
arangelov [Fri, 27 Oct 2017 12:51:28 +0000 (13:51 +0100)]
Make "Action not allowed" dialog compliant with Material Spec and replace full screen activities with the dialog.

Bug: 64893948
Test: make ROBOTEST_FILTER=ActionDisabledByAdminDialogTest -j40 RunSettingsRoboTests
Test: make ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest -j40 RunSettingsRoboTests
Change-Id: I9308d8d86a3789b8f2c92b9f4f20cf00cce71d14

6 years agoFix SettingsRoboTests build error with OpenJDK 9
Victor Chang [Mon, 5 Mar 2018 16:13:33 +0000 (16:13 +0000)]
Fix SettingsRoboTests build error with OpenJDK 9

- CL http://ag/3671365 broke git_pi-release/marlin-userdebug-jdk9
  when building "m checkbuild". It shouldn't break the image build

Test: m SettingsRoboTests
ROBOTEST_FILTER=com.android.settings.datetime.timezone
EXPERIMENTAL_USE_OPENJDK9=true USE_R8=true
Change-Id: I161c0350cff55bd13ba4a6c63df4e4e9bc4b1a5f

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."