OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoUpdate onboarding
Julia Reynolds [Tue, 1 May 2018 20:57:50 +0000 (16:57 -0400)]
Update onboarding

Change text and add 'repeat callers'

Test: robotests
Change-Id: I4b7125a2a9d70cf5ec7e4d184528a444d7d2bcf1
Fixes: 78448988

6 years ago[automerger skipped] Merge "Policy transparency dialog should be shown when SwitchBar...
Yueming Wang [Wed, 2 May 2018 15:15:05 +0000 (08:15 -0700)]
[automerger skipped] Merge "Policy transparency dialog should be shown when SwitchBar is restricted." into pi-dev am: 4c89530ff2
am: 5221bbab26  -s ours

Change-Id: I198fb14f3d66fa1a36bf90857ae6e0183ba2c163

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 ago[automerger skipped] Merge "DO NOT MERGE Update onboarding" into pi-dev am: d521588510
Julia Reynolds [Wed, 2 May 2018 13:56:41 +0000 (06:56 -0700)]
[automerger skipped] Merge "DO NOT MERGE Update onboarding" into pi-dev am: d521588510
am: cb2bd69789  -s ours

Change-Id: I87a2b801987b601a22b9588602dcc1d703eef2d8

6 years ago[automerger skipped] Merge "Require work profile to be unlocked for changing notifica...
Eran Messeri [Wed, 2 May 2018 13:55:42 +0000 (06:55 -0700)]
[automerger skipped] Merge "Require work profile to be unlocked for changing notification settings in a different way" into pi-dev am: a6d36c4e2e
am: b7c83db4fb  -s ours

Change-Id: I3d968f8f600f8d9fae356b16dd0b58b8f003c32d

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 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 agoPolicy transparency dialog should be shown when SwitchBar is restricted.
yuemingw [Tue, 1 May 2018 17:38:10 +0000 (18:38 +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.

Cherry-picked from ag/3924516.

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

Change-Id: Ifa4fa6ebbe7986277f5cd0951a399ea2377a39f9

6 years ago[automerger skipped] Remove the gear icon and change tapping event am: 8dcd550d36
hughchen [Wed, 2 May 2018 07:28:08 +0000 (00:28 -0700)]
[automerger skipped] Remove the gear icon and change tapping event am: 8dcd550d36
am: fb5b43d7c8  -s ours

Change-Id: I0f4e70b10e789e9aa893f4df71609730ecb0fdb2

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 am: 1a38390728
android-build-team Robot [Wed, 2 May 2018 00:24:43 +0000 (17:24 -0700)]
Merge "Update cellular data condition icon and padding." into pi-dev am: 1a38390728
am: 8907b93d07

Change-Id: I1f6c63ad8c8d3a3d020a7ece8fd540ac77427650

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 am: bb5a46fabd
android-build-team Robot [Tue, 1 May 2018 23:21:13 +0000 (16:21 -0700)]
Merge "Workaround task-resolution bug in AM" into pi-dev am: bb5a46fabd
am: f22e98e7c7

Change-Id: I0c2407144a87accaa8e884b31ecc0af2893b6d6e

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 agoMerge "Require work profile to be unlocked for changing notification settings in...
Eran Messeri [Tue, 1 May 2018 20:51:39 +0000 (20:51 +0000)]
Merge "Require work profile to be unlocked for changing notification settings in a different way"

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

Change-Id: Ia074dd1613cb9e1f9417c926f7d26e7d4ac50926

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 am: 5ddff9371d
Doris Ling [Tue, 1 May 2018 20:10:23 +0000 (13:10 -0700)]
Merge "Fix crash in ExternalSourceDetailPreferenceController." into pi-dev am: 5ddff9371d
am: 674fec7f3c

Change-Id: I0c9610bb467a9443480def643bb96135478473e5

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 am: 24cfa88e19
android-build-team Robot [Tue, 1 May 2018 19:45:07 +0000 (12:45 -0700)]
Merge "Disable 'remove' option while setting is selected" into pi-dev am: 24cfa88e19
am: 035e2006e8

Change-Id: Ibae065e51330af2c7abb72a10ac84d284666e4d2

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 am: 139ebd91c0
Fan Zhang [Tue, 1 May 2018 19:33:06 +0000 (12:33 -0700)]
Merge "Add a test to verify lifecycle events are triggered" into pi-dev am: 139ebd91c0
am: cd3e50d4a5

Change-Id: I01d49c423c5ef56d59a51a2f03b4f11d956e19bc

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 agoUpdate zen onboarding ui am: 29ba3601b0
Julia Reynolds [Tue, 1 May 2018 18:05:14 +0000 (11:05 -0700)]
Update zen onboarding ui am: 29ba3601b0
am: fa6482c4a4

Change-Id: I9010987409185d91ff039657cf2b20aeaefd01ad

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 am: d940a...
android-build-team Robot [Tue, 1 May 2018 03:51:39 +0000 (20:51 -0700)]
Merge "Fix a NPE where developer options page crash sometimes." into pi-dev am: d940a680a5
am: aee1191c72

Change-Id: Iac0d2a8551d9c1ba230890dadb1bdf2b6edb12b9

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 agoMerge "Migrate PaymentSettings to DashboardFragment"
android-build-team Robot [Tue, 1 May 2018 01:37:34 +0000 (01:37 +0000)]
Merge "Migrate PaymentSettings to DashboardFragment"

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 agoMigrate PaymentSettings to DashboardFragment
chiujason [Thu, 12 Apr 2018 07:52:00 +0000 (15:52 +0800)]
Migrate PaymentSettings to DashboardFragment

- Move preference related logic to controllers.
- Add some test cases for controllers.

Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.nfc
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
      atest SettingsGatewayTest UniquePreferenceTest
Change-Id: I061a194c170f63fab51974f26c24be43d67d6f6f

6 years agoMerge "Update the color of security status icons" into pi-dev am: c883db167a
android-build-team Robot [Tue, 1 May 2018 00:03:49 +0000 (17:03 -0700)]
Merge "Update the color of security status icons" into pi-dev am: c883db167a
am: 07187fb9b9

Change-Id: I8d5476ee6673e253494a58d984b3196018b0f3ef

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 NPE during unit test"
android-build-team Robot [Mon, 30 Apr 2018 23:44:27 +0000 (23:44 +0000)]
Merge "Fix NPE during unit test"

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

Change-Id: I607af41645c8dd9ddf6209d741d19a78dff946e6

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 agoFix NPE during unit test
Fan Zhang [Mon, 30 Apr 2018 20:41:56 +0000 (13:41 -0700)]
Fix NPE during unit test

As of ag/3932176 the slice indexer now queries getSummary() for each
controller. So we need to create all necessary objects before
getSummary(). In this case, the PSCD object.

Change-Id: I0162996be37d740f1e450880bf4698acd94ca0ad
Fixes: 78897071
Test: atest

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 am: 8e55299f98
android-build-team Robot [Mon, 30 Apr 2018 21:29:58 +0000 (14:29 -0700)]
Merge "Revert "Get rid of charging sounds toggle"" into pi-dev am: 8e55299f98
am: 72cedc72a4

Change-Id: Ib15d341f90072be2fbe3d6b5cb1bfd9c4fcbb938

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 agoReset development tile values when turning off dev option.
Fan Zhang [Mon, 30 Apr 2018 20:14:18 +0000 (13:14 -0700)]
Reset development tile values when turning off dev option.

Change-Id: Ib2e8ea3bfcffca5b2ee3d0ebd3c0c524239d2145
Fixes: 78654641
Test: robotest

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 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
Change-Id: Id168911b082fffac193cd7c7a658ab92d6ce2c15

6 years agoUpdate Conditional padding to align Suggestions
hjchangliao [Mon, 30 Apr 2018 03:42:56 +0000 (11:42 +0800)]
Update Conditional padding to align Suggestions

Reduce start/end padding of Conditional card,
to align Suggestions.

Change-Id: I333bfb848df27e7132d3e26953580de21ea235d3
Fixes: 78660126
Test: Manual test

6 years agoMerge "Migrate ChooseAccountActivity to DashboardFragment"
android-build-team Robot [Sat, 28 Apr 2018 06:10:25 +0000 (06:10 +0000)]
Merge "Migrate ChooseAccountActivity to DashboardFragment"

6 years agoMigrate ChooseAccountActivity to DashboardFragment
Emily Chuang [Thu, 12 Apr 2018 02:12:28 +0000 (10:12 +0800)]
Migrate ChooseAccountActivity to DashboardFragment

- Build a controller to generate/manage a list of preferences.
- Move some logics to the controller and add tests.
- Rename to ChooseAccountFragment.

Bug: 73899467
Test: make RunSettingsRoboTests -j
      atest UniquePreferenceTest SettingsGatewayTest
Change-Id: Id2906c4b922ef159d08c803b976671264c54665f

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

Change-Id: I8e2b631bf2699a88fe163b2fea5699c892f3f184

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 "mark feature flag translateble to avoid loc bugs."
android-build-team Robot [Fri, 27 Apr 2018 21:26:18 +0000 (21:26 +0000)]
Merge "mark feature flag translateble to avoid loc bugs."

6 years agoMerge "Remove the gear icon and change tapping event"
android-build-team Robot [Fri, 27 Apr 2018 17:13:13 +0000 (17:13 +0000)]
Merge "Remove the gear icon and change tapping event"

6 years agoMerge "Add tint attribute to the icon" into pi-dev am: 98496a5683
android-build-team Robot [Fri, 27 Apr 2018 17:03:36 +0000 (10:03 -0700)]
Merge "Add tint attribute to the icon" into pi-dev am: 98496a5683
am: 8e7b570142

Change-Id: Ic1ba08683aa90ca8289d38608dc8d398f0955689

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 "Remove wrapper for LocationManager"
android-build-team Robot [Fri, 27 Apr 2018 16:36:54 +0000 (16:36 +0000)]
Merge "Remove wrapper for LocationManager"

6 years ago[automerger skipped] Merge "Redesign zen visual effects screens" into pi-dev am:...
Julia Reynolds [Fri, 27 Apr 2018 12:53:03 +0000 (05:53 -0700)]
[automerger skipped] Merge "Redesign zen visual effects screens" into pi-dev am: ea360d687d
am: 207d0bbe76  -s ours

Change-Id: I8550202afd948eb932ddc3373c9ce817f6e3f331

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 "Redesign zen visual effects screens"
Julia Reynolds [Fri, 27 Apr 2018 11:08:57 +0000 (11:08 +0000)]
Merge "Redesign zen visual effects screens"

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

* For fix the conflicts in pi-dev, cherry pick the ag/3944480 in
  master and merge the conflict.
* 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.
* Add test to verify when ConnectedBluetoothDeviceUpdater add preference
  the shouldHideSecondTarget() is return true.

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

6 years agoMerge "Fix crash in anomaly job service"
TreeHugger Robot [Fri, 27 Apr 2018 03:57:57 +0000 (03:57 +0000)]
Merge "Fix crash in anomaly job service"

6 years agoRemove wrapper for LocationManager
hjchangliao [Fri, 27 Apr 2018 03:27:46 +0000 (11:27 +0800)]
Remove wrapper for LocationManager

Remove LocationManagerWrapper from SettingsLib

Bug: 76167422
Test: RunSettingsRoboTests
Change-Id: I4ee5de7f6a59468e35ab0bfa2845022b7d7efb3a

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

Change-Id: Ibb80c748317948ab1b5b62f606c06375ee0c1cc9

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

Change-Id: I517a30099c8f28ddbc6ab04bf6a94a339505c9f3

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 am: 720a224e00
Ivan Chiang [Fri, 27 Apr 2018 02:13:07 +0000 (19:13 -0700)]
Merge changes I3dd31855,Id5a75217 into pi-dev am: 720a224e00
am: e598b1ae03

Change-Id: I715f7dba77f7ba10314ed4114b9eda1019171253

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 "Slices feature supports firmware version."
TreeHugger Robot [Fri, 27 Apr 2018 01:10:09 +0000 (01:10 +0000)]
Merge "Slices feature supports firmware version."

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

Change-Id: Ic79fa7da89397c517acd3087e23d652056296e89

6 years agomark feature flag translateble to avoid loc bugs.
Fan Zhang [Fri, 27 Apr 2018 00:35:24 +0000 (17:35 -0700)]
mark feature flag translateble to avoid loc bugs.

Change-Id: I8a5c1e5ce6afbcfb784524a15ad69966ea28b532
Fixes: 78503763
Test: builds