OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoMerge "Refactor badging notification preference controller." into pi-dev
android-build-team Robot [Fri, 4 May 2018 05:25:04 +0000 (22:25 -0700)]
Merge "Refactor badging notification preference controller." into pi-dev
am: 7309dddaa3

Change-Id: I198931640f8d0f3b59c966e4f7c6d6143ec6597f

6 years agoMerge "Refactor badging notification preference controller." into pi-dev
android-build-team Robot [Fri, 4 May 2018 05:18:34 +0000 (05:18 +0000)]
Merge "Refactor badging notification preference controller." into pi-dev

6 years agoMerge "Metrics for user choices in storage wizard." into pi-dev
android-build-team Robot [Fri, 4 May 2018 02:47:45 +0000 (19:47 -0700)]
Merge "Metrics for user choices in storage wizard." into pi-dev
am: 1786dcd4f8

Change-Id: I360d9249d8109ab4733657fe28277c26124066c1

6 years agoMerge "Metrics for user choices in storage wizard." into pi-dev
android-build-team Robot [Fri, 4 May 2018 02:32:09 +0000 (02:32 +0000)]
Merge "Metrics for user choices in storage wizard." into pi-dev

6 years agoMerge "Revert policy transparency dialog title to "Action not allowed"." into pi-dev
android-build-team Robot [Thu, 3 May 2018 23:40:21 +0000 (16:40 -0700)]
Merge "Revert policy transparency dialog title to "Action not allowed"." into pi-dev
am: 9b29aeba5a

Change-Id: Iac3969e34aa8375b84ee5048636a3670e0e5c586

6 years agoMerge "Revert policy transparency dialog title to "Action not allowed"." into pi-dev
android-build-team Robot [Thu, 3 May 2018 23:15:51 +0000 (23:15 +0000)]
Merge "Revert policy transparency dialog title to "Action not allowed"." into pi-dev

6 years agoMerge "Storage wizard UI tweaks." into pi-dev
android-build-team Robot [Thu, 3 May 2018 18:23:08 +0000 (11:23 -0700)]
Merge "Storage wizard UI tweaks." into pi-dev
am: 0e84839f62

Change-Id: I27d42323da5c0bb65620b3c73f78578de8040704

6 years agoMerge "Storage wizard UI tweaks." into pi-dev
android-build-team Robot [Thu, 3 May 2018 18:18:55 +0000 (18:18 +0000)]
Merge "Storage wizard UI tweaks." into pi-dev

6 years agoRefactor badging notification preference controller.
Chuck Liao [Fri, 30 Mar 2018 10:41:18 +0000 (18:41 +0800)]
Refactor badging notification preference controller.

- Convert inheritance from AbstractPreferenceController to TogglePreferenceController.
- Register BadgingNotificationPreferenceController in XML.
- Add RoboTests test cases for BadgingNotificationPreferenceController.

Fixes: 67997784
Test: RunSettingsRoboTests
Change-Id: If10744c067f065e7c2465ca1fff66895d7dc1c56
Merged-In: If10744c067f065e7c2465ca1fff66895d7dc1c56

6 years agoShow the status of private DNS.
Chalard Jean [Thu, 3 May 2018 05:09:27 +0000 (22:09 -0700)]
Show the status of private DNS.
am: f249555f97

Change-Id: I1e1ba2929e2251ee067580564ecec82f7f8c7d44

6 years agoShow the status of private DNS.
Chalard Jean [Thu, 19 Apr 2018 09:23:49 +0000 (18:23 +0900)]
Show the status of private DNS.

This works as follows :
Off → "Off"
Opportunistic, inactive → "Automatic"
Opportunistic, active → "On"
  (stealing a string from notifications for this)
Strict, not resolved and/or not validated → "Couldn't connect"
Strict, resolved and validated → Set up hostname

Bug: 73641539
Test: manual, and updated tests pass
Change-Id: Id1132467288d51aa9cb81a04db65dee438ddfad9

6 years agoMetrics for user choices in storage wizard.
Jeff Sharkey [Wed, 2 May 2018 22:12:05 +0000 (16:12 -0600)]
Metrics for user choices in storage wizard.

These metrics help us understand more about how users in the field
are interacting with adoptable storage.

Bug: 37284068
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I2bb9b5b3683c6ed080233aa595c2626685384923

6 years agoStorage wizard UI tweaks.
Jeff Sharkey [Tue, 1 May 2018 20:53:25 +0000 (14:53 -0600)]
Storage wizard UI tweaks.

Updated assets from UX, and shift to "GlifV3" to get the latest
theme styles.  Verified visually.

Bug: 77469852
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I5bf84e6649577b0c5c874f129fbd1d71c53356e2

6 years agoMerge "Policy transparency dialog should be shown when SwitchBar is restricted."...
Yueming Wang [Wed, 2 May 2018 15:10:30 +0000 (08:10 -0700)]
Merge "Policy transparency dialog should be shown when SwitchBar is restricted." into pi-dev
am: 4c89530ff2

Change-Id: Idda9afd69aae7eec7c00872be1ad8510409416df

6 years agoMerge "Policy transparency dialog should be shown when SwitchBar is restricted."...
Yueming Wang [Wed, 2 May 2018 14:58:47 +0000 (14:58 +0000)]
Merge "Policy transparency dialog should be shown when SwitchBar is restricted." into pi-dev

6 years agoMerge "DO NOT MERGE Update onboarding" into pi-dev
Julia Reynolds [Wed, 2 May 2018 13:53:05 +0000 (06:53 -0700)]
Merge "DO NOT MERGE Update onboarding" into pi-dev
am: d521588510

Change-Id: Ibd40108722683e048cc841f2e4a5352bb412cf8d

6 years agoMerge "Require work profile to be unlocked for changing notification settings in...
Eran Messeri [Wed, 2 May 2018 13:51:41 +0000 (06:51 -0700)]
Merge "Require work profile to be unlocked for changing notification settings in a different way" into pi-dev
am: a6d36c4e2e

Change-Id: I8b55406992369ecec72172d0a2620e6b42093d16

6 years agoMerge "DO NOT MERGE Update onboarding" into pi-dev
Julia Reynolds [Wed, 2 May 2018 13:46:17 +0000 (13:46 +0000)]
Merge "DO NOT MERGE Update onboarding" into pi-dev

6 years agoMerge "Require work profile to be unlocked for changing notification settings in...
Eran Messeri [Wed, 2 May 2018 13:44:48 +0000 (13:44 +0000)]
Merge "Require work profile to be unlocked for changing notification settings in a different way" into pi-dev

6 years agoRevert policy transparency dialog title to "Action not allowed".
yuemingw [Wed, 2 May 2018 12:36:06 +0000 (13:36 +0100)]
Revert policy transparency dialog title to "Action not allowed".

Bug: 78443458
Test: manually by TestDpc.
Change-Id: Ie4a4b6cacb61d7d1a328d67bcf780040efc23ccd

6 years agoPolicy transparency dialog should be shown when SwitchBar is restricted.
yuemingw [Thu, 19 Apr 2018 11:12:11 +0000 (12:12 +0100)]
Policy transparency dialog should be shown when SwitchBar is restricted.

After ag/3818911, touch event of Switchbar is delegated to the switch.
When the SwithBar is disabled by admin, switch is GONE and restricted icon
is VISIBLE instead. We should let touch event be delegaed to restricted
icon and show policy transparency dialog when it's clicked in this case.

Bug: 77898233
Bug: 70206452
Test: Manually via setting disallow_share_location in TestDPC.

Merged-In: Ifa4fa6ebbe7986277f5cd0951a399ea2377a39f9

Change-Id: If4a5349134e6f0e064561b4860966f950ce423b3

6 years agoDO NOT MERGE Update onboarding
Julia Reynolds [Tue, 1 May 2018 20:57:50 +0000 (16:57 -0400)]
DO NOT MERGE Update onboarding

Change text and add 'repeat callers'

Test: robotests
Change-Id: I4b7125a2a9d70cf5ec7e4d184528a444d7d2bcf1
Fixes: 78448988

6 years agoRemove the gear icon and change tapping event
hughchen [Wed, 2 May 2018 07:20:53 +0000 (00:20 -0700)]
Remove the gear icon and change tapping event
am: 8dcd550d36

Change-Id: I404d9abb5338785c74c0587e838f4bce9594c228

6 years agoRemove the gear icon and change tapping event
hughchen [Tue, 24 Apr 2018 07:46:30 +0000 (15:46 +0800)]
Remove the gear icon and change tapping event

* Remove the gear icon in "currently connected" section.
* Change the tapping event in "currently connected" section.
  When tapping device in this section, take user to device detail page.

Bug: 78490845
Test: make -j40 RunSettingsRoboTests
Change-Id: I25f8455def3c38e24dea9af9e9e29ba37c250f67
Merged-In: I25f8455def3c38e24dea9af9e9e29ba37c250f67

6 years agoMerge "Update cellular data condition icon and padding." into pi-dev
android-build-team Robot [Wed, 2 May 2018 00:17:41 +0000 (17:17 -0700)]
Merge "Update cellular data condition icon and padding." into pi-dev
am: 1a38390728

Change-Id: I2372af3d9e40cf3d0d4bcc1f13dffe6d856af18f

6 years agoMerge "Update cellular data condition icon and padding." into pi-dev
android-build-team Robot [Wed, 2 May 2018 00:08:11 +0000 (00:08 +0000)]
Merge "Update cellular data condition icon and padding." into pi-dev

6 years agoMerge "Workaround task-resolution bug in AM" into pi-dev
android-build-team Robot [Tue, 1 May 2018 23:16:52 +0000 (16:16 -0700)]
Merge "Workaround task-resolution bug in AM" into pi-dev
am: bb5a46fabd

Change-Id: Ie3def1978876a5429dc6888de69c2b7c51ed0faa

6 years agoMerge "Workaround task-resolution bug in AM" into pi-dev
android-build-team Robot [Tue, 1 May 2018 23:08:15 +0000 (23:08 +0000)]
Merge "Workaround task-resolution bug in AM" into pi-dev

6 years agoUpdate cellular data condition icon and padding.
Fan Zhang [Tue, 1 May 2018 22:27:01 +0000 (15:27 -0700)]
Update cellular data condition icon and padding.

Change-Id: I01fcdcc09a81758eb12e898aea5d64fa1dc6ef06
Fixes: 79090390
Test: visual

6 years agoRequire work profile to be unlocked for changing notification settings in a different way
Eran Messeri [Mon, 2 Apr 2018 20:10:00 +0000 (23:10 +0300)]
Require work profile to be unlocked for changing notification settings in a different way

Rather than check for the state of the work profile in
LockScreenNotificationPreferenceController#handlePreferenceTreeClick, do so in
the RestrictedListPreference#performClick.
The drawback of checking the state in handlePreferenceTreeClick is that the
preferences are displayed first and then the requirement to unlock/enable the
work profile is displayed on top of it.

This is rather poor UX, so switch to doing the check in performClick and
returning early if the work profile needs to be unlocked/enabled.
This is similar to Patchset 1 from ag/3805482.
The main difference is that the user is returned to the settings screen
both after enabling the work profile and unlocking it.

Test: Manually with TestDPC
Test: atest SettingsRoboTests:RestrictedListPreferenceTest
Bug: 77408805
Merged-In: Id168911b082fffac193cd7c7a658ab92d6ce2c15
Change-Id: I0a3a4ec4dda78e28ee88a11d383eda49e9cf50a6

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
android-build-team Robot [Tue, 1 May 2018 20:21:05 +0000 (13:21 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: a020cc9c0a  -s ours

Change-Id: I4417e943078fd0f831b583736951bf42e96b1e55

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
android-build-team Robot [Tue, 1 May 2018 20:16:51 +0000 (20:16 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Fix crash in ExternalSourceDetailPreferenceController." into pi-dev
Doris Ling [Tue, 1 May 2018 20:06:04 +0000 (13:06 -0700)]
Merge "Fix crash in ExternalSourceDetailPreferenceController." into pi-dev
am: 5ddff9371d

Change-Id: I26b3122b17b71e9729d198bcbaa8f1620c40e06e

6 years agoMerge "Fix crash in ExternalSourceDetailPreferenceController." into pi-dev
Doris Ling [Tue, 1 May 2018 19:58:56 +0000 (19:58 +0000)]
Merge "Fix crash in ExternalSourceDetailPreferenceController." into pi-dev

6 years agoMerge "Disable 'remove' option while setting is selected" into pi-dev
android-build-team Robot [Tue, 1 May 2018 19:41:31 +0000 (12:41 -0700)]
Merge "Disable 'remove' option while setting is selected" into pi-dev
am: 24cfa88e19

Change-Id: I2f737729d9525623bc4b5edb5ff84cae07ee007e

6 years agoMerge "Disable 'remove' option while setting is selected" into pi-dev
android-build-team Robot [Tue, 1 May 2018 19:34:15 +0000 (19:34 +0000)]
Merge "Disable 'remove' option while setting is selected" into pi-dev

6 years agoMerge "Add a test to verify lifecycle events are triggered" into pi-dev
Fan Zhang [Tue, 1 May 2018 19:25:44 +0000 (12:25 -0700)]
Merge "Add a test to verify lifecycle events are triggered" into pi-dev
am: 139ebd91c0

Change-Id: Ia8ce612d5daa6bb17114188729a295c684eef2e0

6 years agoMerge "Add a test to verify lifecycle events are triggered" into pi-dev
Fan Zhang [Tue, 1 May 2018 19:04:44 +0000 (19:04 +0000)]
Merge "Add a test to verify lifecycle events are triggered" into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 1 May 2018 18:47:35 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 78510764
Change-Id: I675f55ab20567796d3580e386fecc87d4f8c3d78

6 years agoDisable 'remove' option while setting is selected
Julia Reynolds [Tue, 1 May 2018 14:07:59 +0000 (10:07 -0400)]
Disable 'remove' option while setting is selected

Test: robotests
Bug: 78916709
Change-Id: Id1dfc3b61a80c2e0677472ae84dc7425116825f0

6 years agoUpdate zen onboarding ui
Julia Reynolds [Tue, 1 May 2018 17:33:18 +0000 (10:33 -0700)]
Update zen onboarding ui
am: 29ba3601b0

Change-Id: I2c1769f683dd464c96e758b61bd5e47b4a538c44

6 years agoWorkaround task-resolution bug in AM
Winson Chung [Tue, 1 May 2018 17:22:08 +0000 (10:22 -0700)]
Workaround task-resolution bug in AM

- Keep launching notification settings in the Settings task. This is not
  the expected behavior, but only a workaround until b/72420153 is
  fixed.

Bug: 72420153
Test: Enter PIP, go to app > notifications > additional settings, ensure
      that it doesn't start in the PIP task

Change-Id: I73e704a283285462d4884db21923818cfb6deead

6 years agoUpdate zen onboarding ui
Julia Reynolds [Mon, 30 Apr 2018 13:13:34 +0000 (09:13 -0400)]
Update zen onboarding ui

Test: robotests
Bug: 78448988
Change-Id: I1e70bf8d28f392b93bb102622340da0af65f4718

6 years agoMerge "Fix a NPE where developer options page crash sometimes." into pi-dev
android-build-team Robot [Tue, 1 May 2018 02:40:16 +0000 (19:40 -0700)]
Merge "Fix a NPE where developer options page crash sometimes." into pi-dev
am: d940a680a5

Change-Id: Ida116e1bedb08795077991c391426fce5d820bca

6 years agoAdd a test to verify lifecycle events are triggered
Fan Zhang [Fri, 27 Apr 2018 00:35:24 +0000 (17:35 -0700)]
Add a test to verify lifecycle events are triggered

- Added a footer in feature flags, displaying "Experimental" during
  onStart.
- Ui test to verify the text shows correctly.

Change-Id: Ibf4f79cb3c12e460384e83201a16005a18d6437d
Fixes: 78887450
Test: atest

6 years agoMerge "Fix a NPE where developer options page crash sometimes." into pi-dev
android-build-team Robot [Tue, 1 May 2018 01:30:41 +0000 (01:30 +0000)]
Merge "Fix a NPE where developer options page crash sometimes." into pi-dev

6 years agoFix crash in ExternalSourceDetailPreferenceController.
Doris Ling [Tue, 1 May 2018 00:38:29 +0000 (17:38 -0700)]
Fix crash in ExternalSourceDetailPreferenceController.

- Add null check for the package info when trying to retrieve the
install app state. During package update, the package info might becomes
null. The App info activity will finish in that case, but this method
might be called before the activity actually finishes.

Change-Id: I18ff448666dfb403bb6693fccd3e54276db36f37
Fixes: 78257414
Test: make RunSettingsRoboTests

6 years agoFix a NPE where developer options page crash sometimes.
Fan Zhang [Mon, 30 Apr 2018 23:24:42 +0000 (16:24 -0700)]
Fix a NPE where developer options page crash sometimes.

Developer options page crash for restricted users because the page
removes all preferences while DashboardFeatureProvider tries to
manipulate preferences on screen.

Added a null check to skip changin prefs in DashboardFeatureProvider
because the pref is going to be removed either way.

Change-Id: Ic83fd0dfb2a906605fb1d992d7b36c2163630e89
Fixes: 78655710
Test: robotests

6 years agoMerge "Update the color of security status icons" into pi-dev
android-build-team Robot [Mon, 30 Apr 2018 23:54:02 +0000 (16:54 -0700)]
Merge "Update the color of security status icons" into pi-dev
am: c883db167a

Change-Id: I738495f88c1655b0e3e479eb56812a670ab785f6

6 years agoMerge "Update the color of security status icons" into pi-dev
android-build-team Robot [Mon, 30 Apr 2018 23:49:41 +0000 (23:49 +0000)]
Merge "Update the color of security status icons" into pi-dev

6 years agoMerge "Fix fingerprint suggestion icon color." into pi-dev
android-build-team Robot [Mon, 30 Apr 2018 22:30:20 +0000 (15:30 -0700)]
Merge "Fix fingerprint suggestion icon color." into pi-dev
am: 6590f6948d

Change-Id: Iacdf068f690d31c3e37a91e9cacb7a3810b4a9ef

6 years agoMerge "Fix fingerprint suggestion icon color." into pi-dev
android-build-team Robot [Mon, 30 Apr 2018 22:17:30 +0000 (22:17 +0000)]
Merge "Fix fingerprint suggestion icon color." into pi-dev

6 years agoUpdate the color of security status icons
Antony Sargent [Mon, 30 Apr 2018 21:59:50 +0000 (14:59 -0700)]
Update the color of security status icons

Also update res/drawable/ic_ota_update_none.xml to have the same
contents as res/drawable/ic_ota_update_stale.xml.

Bug: 74255242
Test: manual (go to Settings->Security & location; the icons in the
Security status section at the top should be colorful)

Change-Id: I1c54c5b6803268e3acf9720c7c555476405d624e

6 years agoMerge "Revert "Get rid of charging sounds toggle"" into pi-dev
android-build-team Robot [Mon, 30 Apr 2018 21:22:42 +0000 (14:22 -0700)]
Merge "Revert "Get rid of charging sounds toggle"" into pi-dev
am: 8e55299f98

Change-Id: I58e93b9c70d57224c01bd62fa47640badd1febaf

6 years agoFix fingerprint suggestion icon color.
Doris Ling [Mon, 30 Apr 2018 21:08:55 +0000 (14:08 -0700)]
Fix fingerprint suggestion icon color.

- add tintable flag to the suggestion metadata so that it will be
displayed in correct tint color.

Change-Id: I29b6d3a8b7c47354d6022aea4d4f01986f5ce2b3
Fixes: 78655925
Test: visual

6 years agoMerge "Revert "Get rid of charging sounds toggle"" into pi-dev
android-build-team Robot [Mon, 30 Apr 2018 21:08:51 +0000 (21:08 +0000)]
Merge "Revert "Get rid of charging sounds toggle"" into pi-dev

6 years agoRevert "Get rid of charging sounds toggle"
Beverly Tai [Mon, 30 Apr 2018 20:01:40 +0000 (20:01 +0000)]
Revert "Get rid of charging sounds toggle"

Bug: 77912907
This reverts commit fbe721b1b39d48ef8665267774b54f5f04b20d58.

Reason for revert: negative dogfood feedback

Change-Id: I8485a379eafee0a4fcd599e9b1c47aee7dd3c6ad

6 years agoMerge "Updated play button icon for paused animations" into pi-dev
android-build-team Robot [Fri, 27 Apr 2018 22:54:21 +0000 (15:54 -0700)]
Merge "Updated play button icon for paused animations" into pi-dev
am: 0929651a77

Change-Id: I02c0842e2eb135e87a941b34a364341e9128924a

6 years agoMerge "Updated play button icon for paused animations" into pi-dev
android-build-team Robot [Fri, 27 Apr 2018 22:47:29 +0000 (22:47 +0000)]
Merge "Updated play button icon for paused animations" into pi-dev

6 years agoMerge "Add tint attribute to the icon" into pi-dev
android-build-team Robot [Fri, 27 Apr 2018 16:59:24 +0000 (09:59 -0700)]
Merge "Add tint attribute to the icon" into pi-dev
am: 98496a5683

Change-Id: Ic69e73f1847637cf7913e03696e6823840bbcb38

6 years agoMerge "Add tint attribute to the icon" into pi-dev
android-build-team Robot [Fri, 27 Apr 2018 16:55:06 +0000 (16:55 +0000)]
Merge "Add tint attribute to the icon" into pi-dev

6 years agoMerge "Redesign zen visual effects screens" into pi-dev
Julia Reynolds [Fri, 27 Apr 2018 12:48:26 +0000 (05:48 -0700)]
Merge "Redesign zen visual effects screens" into pi-dev
am: ea360d687d

Change-Id: I416a1265f129825d91475ba63c30f02ec37adb52

6 years agoMerge "Redesign zen visual effects screens" into pi-dev
Julia Reynolds [Fri, 27 Apr 2018 12:41:58 +0000 (12:41 +0000)]
Merge "Redesign zen visual effects screens" into pi-dev

6 years agoRedesign zen visual effects screens
Julia Reynolds [Mon, 23 Apr 2018 16:24:21 +0000 (12:24 -0400)]
Redesign zen visual effects screens

Test: robotests
Bug: 78448988
Change-Id: I3040c1103d76c75601e82e3660a2ace202837ec2
Merged-In: I3040c1103d76c75601e82e3660a2ace202837ec2

6 years agoMerge "Update StorageSummaryDonutPreference content" into pi-dev
Tony Huang [Fri, 27 Apr 2018 03:01:14 +0000 (20:01 -0700)]
Merge "Update StorageSummaryDonutPreference content" into pi-dev
am: 070238df13

Change-Id: If003dd4abdd28f07acc531c863b950eff69265ff

6 years agoMerge "Change fingerprint enrolling animation to 4 colors" into pi-dev
Cyril Lee [Fri, 27 Apr 2018 03:00:20 +0000 (20:00 -0700)]
Merge "Change fingerprint enrolling animation to 4 colors" into pi-dev
am: 66640d6412

Change-Id: I781b47a12226b7ef93ee7bf6edcc43554e6a32bf

6 years agoMerge "Update StorageSummaryDonutPreference content" into pi-dev
Tony Huang [Fri, 27 Apr 2018 02:58:15 +0000 (02:58 +0000)]
Merge "Update StorageSummaryDonutPreference content" into pi-dev

6 years agoMerge "Change fingerprint enrolling animation to 4 colors" into pi-dev
Cyril Lee [Fri, 27 Apr 2018 02:53:30 +0000 (02:53 +0000)]
Merge "Change fingerprint enrolling animation to 4 colors" into pi-dev

6 years agoAdd tint attribute to the icon
Sam.SH Chang [Fri, 27 Apr 2018 02:28:00 +0000 (10:28 +0800)]
Add tint attribute to the icon

Bug: 78238313
Test: build pass
Change-Id: I805f5a8f1c21f617d3555e135e9d332b77ca0c29

6 years agoMerge changes I3dd31855,Id5a75217 into pi-dev
Ivan Chiang [Fri, 27 Apr 2018 02:06:38 +0000 (19:06 -0700)]
Merge changes I3dd31855,Id5a75217 into pi-dev
am: 720a224e00

Change-Id: Ibf611643afabea5ed181b0336da5e949d416e064

6 years agoMerge changes I3dd31855,Id5a75217 into pi-dev
TreeHugger Robot [Fri, 27 Apr 2018 01:59:16 +0000 (01:59 +0000)]
Merge changes I3dd31855,Id5a75217 into pi-dev

* changes:
  Show docks on previously connected devices page
  Show Dock devices in Connected devices page

6 years agoMerge "Improve battery saver setting a11y semantics" into pi-dev
Phil Weaver [Fri, 27 Apr 2018 00:27:12 +0000 (17:27 -0700)]
Merge "Improve battery saver setting a11y semantics" into pi-dev
am: 577f2af92b

Change-Id: I223549eac9f7716ad514a3c0051018d97f7d9377

6 years agoMerge "Improve battery saver setting a11y semantics" into pi-dev
Phil Weaver [Thu, 26 Apr 2018 23:50:54 +0000 (23:50 +0000)]
Merge "Improve battery saver setting a11y semantics" into pi-dev

6 years agoMerge "Modified the AirplaneModePreferenceController for slice" into pi-dev
Fan Zhang [Thu, 26 Apr 2018 23:40:23 +0000 (16:40 -0700)]
Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev
am: 62cd5f7f0f

Change-Id: I52220905e7a29dfc559c32ad6322a9681e390f83

6 years agoMerge "Hide cancel button in Confirm Lock Pattern" into pi-dev
Maurice Lam [Thu, 26 Apr 2018 23:19:31 +0000 (16:19 -0700)]
Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev
am: fd45210510

Change-Id: I959d3b3535d07168c6b0f6c9b9c043da93a6564c

6 years agoMerge "Modified the AirplaneModePreferenceController for slice" into pi-dev
Fan Zhang [Thu, 26 Apr 2018 23:12:14 +0000 (23:12 +0000)]
Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev

6 years agoMerge "Hide cancel button in Confirm Lock Pattern" into pi-dev
TreeHugger Robot [Thu, 26 Apr 2018 22:58:37 +0000 (22:58 +0000)]
Merge "Hide cancel button in Confirm Lock Pattern" into pi-dev

6 years agoMerge "Don't show high usage tip when device is charing" into pi-dev
Lei Yu [Thu, 26 Apr 2018 22:27:26 +0000 (15:27 -0700)]
Merge "Don't show high usage tip when device is charing" into pi-dev
am: 3f34ce9a5b

Change-Id: Ie44032fb84bbe795c296b8b5fbd232c79d242612

6 years agoMerge "Hook up Adaptive Battery to new flag." into pi-dev
Lei Yu [Thu, 26 Apr 2018 22:26:50 +0000 (15:26 -0700)]
Merge "Hook up Adaptive Battery to new flag." into pi-dev
am: d2e9b56996

Change-Id: I643e48d47eba103ad24b26c0a425fd9c61b7aacf

6 years agoMerge "Add auto-granting of slice permissions" into pi-dev
Jason Monk [Thu, 26 Apr 2018 22:26:14 +0000 (15:26 -0700)]
Merge "Add auto-granting of slice permissions" into pi-dev
am: f778a91a88

Change-Id: Ia4a1f22daca16324c23e401df8bc674ddc33e3d1

6 years agoMerge "Increase volume search timeout, fix dialog flow." into pi-dev
Jeff Sharkey [Thu, 26 Apr 2018 22:25:05 +0000 (15:25 -0700)]
Merge "Increase volume search timeout, fix dialog flow." into pi-dev
am: 2e3aacaa7a

Change-Id: If026407618907cbbb6ccd456e5fb9fcea5c13826

6 years agoMerge "Don't show high usage tip when device is charing" into pi-dev
Lei Yu [Thu, 26 Apr 2018 22:08:55 +0000 (22:08 +0000)]
Merge "Don't show high usage tip when device is charing" into pi-dev

6 years agoMerge "Hook up Adaptive Battery to new flag." into pi-dev
Lei Yu [Thu, 26 Apr 2018 22:07:53 +0000 (22:07 +0000)]
Merge "Hook up Adaptive Battery to new flag." into pi-dev

6 years agoMerge "Add auto-granting of slice permissions" into pi-dev
Jason Monk [Thu, 26 Apr 2018 22:05:19 +0000 (22:05 +0000)]
Merge "Add auto-granting of slice permissions" into pi-dev

6 years agoModified the AirplaneModePreferenceController for slice
sunnyshao [Tue, 24 Apr 2018 07:57:25 +0000 (15:57 +0800)]
Modified the AirplaneModePreferenceController for slice

- Updated the AirplaneModePreferenceController for slice feature
- Updated the AirplaneModeEnabler for slice feature

Fixes: 78645242
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.network
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.dashboard
      atest UniquePreferenceTest SettingsGatewayTest

Change-Id: I4afbc666f916570d648ad2b33ebb25924024e9f1

6 years agoMerge "Increase volume search timeout, fix dialog flow." into pi-dev
TreeHugger Robot [Thu, 26 Apr 2018 21:28:16 +0000 (21:28 +0000)]
Merge "Increase volume search timeout, fix dialog flow." into pi-dev

6 years agoMerge "Only start tether when not already enabled" into pi-dev
Salvador Martinez [Thu, 26 Apr 2018 21:15:25 +0000 (14:15 -0700)]
Merge "Only start tether when not already enabled" into pi-dev
am: f62f91b0b6

Change-Id: If28a47b85fab06484298196305e862759998a72f

6 years agoMerge "Push full slice index to device index" into pi-dev
Jason Monk [Thu, 26 Apr 2018 21:08:36 +0000 (14:08 -0700)]
Merge "Push full slice index to device index" into pi-dev
am: 3d29ca2893

Change-Id: I51d4b2d8a271460215f0d489a372932fca5b3d8b

6 years agoMerge "Only start tether when not already enabled" into pi-dev
TreeHugger Robot [Thu, 26 Apr 2018 20:57:57 +0000 (20:57 +0000)]
Merge "Only start tether when not already enabled" into pi-dev

6 years agoMerge "Push full slice index to device index" into pi-dev
Jason Monk [Thu, 26 Apr 2018 20:48:41 +0000 (20:48 +0000)]
Merge "Push full slice index to device index" into pi-dev

6 years agoUpdated play button icon for paused animations
Antony Sargent [Tue, 24 Apr 2018 16:57:44 +0000 (09:57 -0700)]
Updated play button icon for paused animations

The current play button is mostly white and hard to see with the new
animation videos. This updates it to one which has more blue to stand
out better.

Fixes: 78306799
Test: manual (while watching one of the animations at Settings -> System
-> Gestures; tap the video to pause)
Change-Id: I48deb6c35eccb3ecd21f2aa6dcc3d275c7436f47

6 years agoMerge "Index database before getting Uri Descendants" into pi-dev
Matthew Fritze [Thu, 26 Apr 2018 20:27:18 +0000 (13:27 -0700)]
Merge "Index database before getting Uri Descendants" into pi-dev
am: a7fd137e2d

Change-Id: I88d50fd6157b9a62209e0afa1e6a791974a3c38b

6 years agoMerge "Index database before getting Uri Descendants" into pi-dev
Matthew Fritze [Thu, 26 Apr 2018 20:14:53 +0000 (20:14 +0000)]
Merge "Index database before getting Uri Descendants" into pi-dev

6 years agoMerge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev
Oscar Shu [Thu, 26 Apr 2018 18:25:15 +0000 (11:25 -0700)]
Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev
am: 0b302499cd

Change-Id: I1cd33b35066d2dfa4b349dc163a2a16f7f0a123b

6 years agoMerge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev
Oscar Shu [Thu, 26 Apr 2018 18:16:49 +0000 (18:16 +0000)]
Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev

6 years agoMerge "Hiding data remaining text when available space is too small." into pi-dev
Jan Nordqvist [Thu, 26 Apr 2018 17:48:03 +0000 (10:48 -0700)]
Merge "Hiding data remaining text when available space is too small." into pi-dev
am: 5f6937dd88

Change-Id: I26b52aa76c4eab8e5240efae826debc74cb73e3e

6 years agoMerge "Hiding data remaining text when available space is too small." into pi-dev
TreeHugger Robot [Thu, 26 Apr 2018 17:33:53 +0000 (17:33 +0000)]
Merge "Hiding data remaining text when available space is too small." into pi-dev

6 years agoOnly start tether when not already enabled
Salvador Martinez [Tue, 24 Apr 2018 23:03:34 +0000 (16:03 -0700)]
Only start tether when not already enabled

The toggle in the tether page currently tries to start tethering if
it gets turned on. However, changing a wifi config can cause
startTether to be called and also the toggle to switch leading to
a double call to startTether. This CL makes it so that if we are
already connected to tethering we don't try to start it again.

Test: robotests
Change-Id: I91085244c5d1fcc245a6b6480e638a32bc14f0ac
Fixes: 78028548
Fixes: 78441216
Fixes: 74368363

6 years agoMerge "Settings: update color mode preview to final content" into pi-dev
Sean Callanan [Thu, 26 Apr 2018 17:04:44 +0000 (10:04 -0700)]
Merge "Settings: update color mode preview to final content" into pi-dev
am: 9b08ed63e9

Change-Id: Ifd93423d8e22f5dc6f44e51db458c553007ffefd

6 years agoMerge "Settings: update color mode preview to final content" into pi-dev
Sean Callanan [Thu, 26 Apr 2018 16:39:51 +0000 (16:39 +0000)]
Merge "Settings: update color mode preview to final content" into pi-dev