OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 28 Mar 2016 14:46:13 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 28 Mar 2016 14:42:47 +0000 (07:42 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge changes I22d799f8,I1bc14e7a into nyc-dev
Jason Monk [Mon, 28 Mar 2016 14:14:01 +0000 (14:14 +0000)]
Merge changes I22d799f8,I1bc14e7a into nyc-dev

* changes:
  Guard against crash in dev options
  Switch to whitelist for animations

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Sat, 26 Mar 2016 17:26:10 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 26 Mar 2016 07:37:09 +0000 (00:37 -0700)]
Import translations. DO NOT MERGE

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

8 years agoCall it "Opening links" now
Christopher Tate [Thu, 24 Mar 2016 23:48:32 +0000 (16:48 -0700)]
Call it "Opening links" now

Better labels are better.

Bug 27834016

Change-Id: I3f5a8088234db7790ac8baded0547f415d7e2c4c

8 years agoMerge "Move DensityUtils into SettingsLib" into nyc-dev
Alan Viverette [Fri, 25 Mar 2016 19:59:37 +0000 (19:59 +0000)]
Merge "Move DensityUtils into SettingsLib" into nyc-dev

8 years agoMove DensityUtils into SettingsLib
Alan Viverette [Fri, 25 Mar 2016 18:56:25 +0000 (14:56 -0400)]
Move DensityUtils into SettingsLib

Bug: 27644685
Change-Id: Ie493bd7b07700c2df1221a4257c0487db2a14ff7

8 years agoMerge "Use changed getStatus interface" into nyc-dev
Philip P. Moltmann [Fri, 25 Mar 2016 16:50:34 +0000 (16:50 +0000)]
Merge "Use changed getStatus interface" into nyc-dev

8 years agoUse changed getStatus interface
Philip P. Moltmann [Fri, 18 Mar 2016 16:38:24 +0000 (09:38 -0700)]
Use changed getStatus interface

Change-Id: I72a2aa74607e34a1afbef0982f634def3e30efd4

8 years agoMerge "Updates spacing on redaction interstitial" into nyc-dev
Udam Saini [Thu, 24 Mar 2016 22:20:10 +0000 (22:20 +0000)]
Merge "Updates spacing on redaction interstitial" into nyc-dev

8 years agoMerge "Rules without a configuration activity aren't clickable." into nyc-dev
Julia Reynolds [Thu, 24 Mar 2016 22:11:52 +0000 (22:11 +0000)]
Merge "Rules without a configuration activity aren't clickable." into nyc-dev

8 years agoRules without a configuration activity aren't clickable.
Julia Reynolds [Thu, 24 Mar 2016 21:22:13 +0000 (14:22 -0700)]
Rules without a configuration activity aren't clickable.

Bug: 27823109
Change-Id: Ifa2291627846e562f9a04ec1e85582833ab234de

8 years agoMerge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev
Robin Lee [Thu, 24 Mar 2016 18:32:51 +0000 (18:32 +0000)]
Merge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev

8 years agoMerge "Add indicator for system dialer in Settings" into nyc-dev
Hall Liu [Thu, 24 Mar 2016 17:29:39 +0000 (17:29 +0000)]
Merge "Add indicator for system dialer in Settings" into nyc-dev

8 years agoImplement action "android.settings.VPN_SETTINGS"
Robin Lee [Thu, 24 Mar 2016 16:02:08 +0000 (16:02 +0000)]
Implement action "android.settings.VPN_SETTINGS"

Bug: 27700919
Change-Id: Ibd23f1d53d40addc2ff8ac3215f3524b7e8c9c2e

8 years agoMerge "Don't close USB type notification when USB is connected to USB devices." into...
Daichi Hirono [Thu, 24 Mar 2016 02:46:23 +0000 (02:46 +0000)]
Merge "Don't close USB type notification when USB is connected to USB devices." into nyc-dev

8 years agoUpdates spacing on redaction interstitial
Udam Saini [Mon, 21 Mar 2016 22:32:24 +0000 (15:32 -0700)]
Updates spacing on redaction interstitial

Cleans up the look and feel on the redaction interstitial page

bug:27534261
Change-Id: I9495cfc9493f0d199b30335985761d069a29d42d

8 years agoMerge "Fix build" into nyc-dev
Yorke Lee [Wed, 23 Mar 2016 18:17:57 +0000 (18:17 +0000)]
Merge "Fix build" into nyc-dev

8 years agoFix build
Yorke Lee [Wed, 23 Mar 2016 18:11:46 +0000 (11:11 -0700)]
Fix build

Change-Id: I99d94806fabef469f4ad984e65a58e4f69808e68

8 years agoMerge "Add more policy transparency for disallow_remove_user restriction." into nyc-dev
Sudheer Shanka [Wed, 23 Mar 2016 17:53:24 +0000 (17:53 +0000)]
Merge "Add more policy transparency for disallow_remove_user restriction." into nyc-dev

8 years agoMerge "Add more policy transparency for wifi settings." into nyc-dev
Sudheer Shanka [Wed, 23 Mar 2016 17:53:19 +0000 (17:53 +0000)]
Merge "Add more policy transparency for wifi settings." into nyc-dev

8 years agoMerge "Add disabled by policy empty views to more screens." into nyc-dev
Sudheer Shanka [Wed, 23 Mar 2016 17:53:15 +0000 (17:53 +0000)]
Merge "Add disabled by policy empty views to more screens." into nyc-dev

8 years agoMerge "InputSettings: Physical keyboard settings activity." into nyc-dev
Abodunrinwa Toki [Wed, 23 Mar 2016 16:03:23 +0000 (16:03 +0000)]
Merge "InputSettings: Physical keyboard settings activity." into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 23 Mar 2016 14:39:30 +0000 (07:39 -0700)]
Import translations. DO NOT MERGE

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

8 years agoAdd more policy transparency for disallow_remove_user restriction.
Sudheer Shanka [Wed, 23 Mar 2016 00:24:07 +0000 (17:24 -0700)]
Add more policy transparency for disallow_remove_user restriction.

Bug: 27784015
Change-Id: I2386efbf521ee8e73326006e78b0146341745e2b

8 years agoMerge "don't toggle OEM unlocking if the preference is not enabled" into nyc-dev
Andres Morales [Tue, 22 Mar 2016 21:20:43 +0000 (21:20 +0000)]
Merge "don't toggle OEM unlocking if the preference is not enabled" into nyc-dev

8 years agodon't toggle OEM unlocking if the preference is not enabled
Andres Morales [Tue, 22 Mar 2016 19:50:33 +0000 (12:50 -0700)]
don't toggle OEM unlocking if the preference is not enabled

Toggling the top-level switch is bypassing the disabled
state of the switch and leaving it in an inconsistent and
unrecoverable state.

Bug: 26863852
Change-Id: I9fed626b743fd6aac2c20910493bdec4778cc629

8 years agoInputSettings: Physical keyboard settings activity.
Abodunrinwa Toki [Tue, 22 Mar 2016 16:29:38 +0000 (16:29 +0000)]
InputSettings: Physical keyboard settings activity.

This CL adds functionality to trigger the "Physical keyboard"
settings screen via an intent.

Bug: 26943892
Change-Id: Ib4a0be38f94f83672501d5312079d132b2ab717d

8 years agoMerge "Guard against monkey crash." into nyc-dev
Jason Monk [Tue, 22 Mar 2016 16:38:44 +0000 (16:38 +0000)]
Merge "Guard against monkey crash." into nyc-dev

8 years agoGuard against monkey crash.
Jason Monk [Tue, 22 Mar 2016 16:17:12 +0000 (09:17 -0700)]
Guard against monkey crash.

Bug: 27784445
Change-Id: I4ba6e02e0cdb6857661a824ae0888feac6762a05

8 years agoMerge "Move hint strings to SettingsLib" into nyc-dev
Tony Mantler [Tue, 22 Mar 2016 16:16:14 +0000 (16:16 +0000)]
Merge "Move hint strings to SettingsLib" into nyc-dev

8 years agoDon't close USB type notification when USB is connected to USB devices.
Daichi Hirono [Tue, 22 Mar 2016 02:04:29 +0000 (11:04 +0900)]
Don't close USB type notification when USB is connected to USB devices.

Previously we show a notificatino to show the UsbModeChooser when
Android is connected to another Android via USB type C cable.
However UsbModeChoooser activity was closed immediately after a user
tapped the notification, if the Android worked as host.

FIXED=27535640

Change-Id: I707dcbf1021e7381096c0ae7cc2d712892ac5a5a

8 years agoFix Crash in the WiFi Status Test Menu
Nathan Harold [Mon, 21 Mar 2016 22:13:31 +0000 (15:13 -0700)]
Fix Crash in the WiFi Status Test Menu

-Remove fragments of the defunct/removed ip-address ping test
-Update a dangling resource reference

Bug: 27771038
Change-Id: Ib26eb6427eb6fbe6ef2d1f235277af3d2e8093f1

8 years agoMove hint strings to SettingsLib
Tony Mantler [Mon, 21 Mar 2016 21:51:55 +0000 (14:51 -0700)]
Move hint strings to SettingsLib

b/18246360

Change-Id: I7b8f6badde4e0a4d47c408e2acb70ae3fe8557a9

8 years agoMerge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into...
Tony Mak [Mon, 21 Mar 2016 15:20:34 +0000 (15:20 +0000)]
Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev

8 years agoMerge "Per vpn setting change in VPN list" into nyc-dev
Victor Chang [Mon, 21 Mar 2016 15:20:13 +0000 (15:20 +0000)]
Merge "Per vpn setting change in VPN list" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 21 Mar 2016 14:41:09 +0000 (14:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 21 Mar 2016 14:40:16 +0000 (07:40 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Vpn settings per vpn" into nyc-dev
Victor Chang [Mon, 21 Mar 2016 13:09:07 +0000 (13:09 +0000)]
Merge "Vpn settings per vpn" into nyc-dev

8 years agoPer vpn setting change in VPN list
Victor Chang [Tue, 15 Mar 2016 18:48:08 +0000 (18:48 +0000)]
Per vpn setting change in VPN list

- Show admin support details when user taps on a cell and user restriction is on
- Show always-on-vpn active status in preference summary
- User can still open non-configurable per-VPN info page even when user restriction is applied
- Rename ConfigPreference to LegacyVpnPreference
- Move summary String handling into ManageablePreference
- ManageablePreference inherits GearPreference to reuse the code
- Don't show disconnect dialog when always-on is enabled

BUG=26950700

Change-Id: I37b087879cf3b674df528e7787d7bb1eead3310f

8 years agoVpn settings per vpn
Victor Chang [Fri, 11 Mar 2016 19:44:56 +0000 (19:44 +0000)]
Vpn settings per vpn

This CL adds a setting for each VPN
- When no_config_vpn user restriction is applied, user can't change anything in the page
- Launch the subsetting activity in the corresponding user to unlock keystore and force work challenge
- Show dialog when user replace always-on-VPN package
- When forget VPN, unset always-on-vpn

TODO: show per-VPN status in VPN list

Change-Id: Ica360ea44117db6a4ecfaed1eec6c188189c246c

8 years agoMerge "User should confirm device lock before un-unifying" into nyc-dev
Clara Bayarri [Mon, 21 Mar 2016 11:12:20 +0000 (11:12 +0000)]
Merge "User should confirm device lock before un-unifying" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 19 Mar 2016 03:17:38 +0000 (04:17 +0100)]
Import translations. DO NOT MERGE

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

8 years agoAdd indicator for system dialer in Settings
Hall Liu [Tue, 15 Mar 2016 23:30:43 +0000 (16:30 -0700)]
Add indicator for system dialer in Settings

Bug: 26748630
Change-Id: I60b9f2783fb4c1f49c79449dd150132c73a9fb2a

8 years agoMerge "Stops black screen from being displayed on changing Vision Settings in SUW...
Anna Galusza [Fri, 18 Mar 2016 21:32:52 +0000 (21:32 +0000)]
Merge "Stops black screen from being displayed on changing Vision Settings in SUW. Bug: 27328791" into nyc-dev

8 years agoUser should confirm device lock before un-unifying
Mahaver Chopra [Fri, 18 Mar 2016 19:08:05 +0000 (19:08 +0000)]
User should confirm device lock before un-unifying

User should confirm device lock before un-unifying
Move Use the same lock toggle the first option
When Unifying Title while confirming device password is of profile.

Bug: 26815727
Bug: 27523804
Bug: 27547551

Change-Id: I44857f7dcff3d68486e7e4d2ae8565b56d7c91b7

8 years agoGuard against crash in dev options
Jason Monk [Fri, 18 Mar 2016 18:40:42 +0000 (14:40 -0400)]
Guard against crash in dev options

Bug: 27480962
Change-Id: I22d799f8796f94febda7bd49eb7431d29201e37f

8 years agoSwitch to whitelist for animations
Jason Monk [Fri, 18 Mar 2016 18:23:01 +0000 (14:23 -0400)]
Switch to whitelist for animations

Disable animations for all SettingsPreferenceFragments, unless they
explicitly ask for them before creating their preference screens.

Turn it on for all fragments using the cached removal currently.

Bug: 27713314
Change-Id: I1bc14e7aeb3ee5b8ddb4f3547f472305cd312edf

8 years agoMerge "Should read specific user's password restriction" into nyc-dev
Tony Mak [Fri, 18 Mar 2016 18:51:58 +0000 (18:51 +0000)]
Merge "Should read specific user's password restriction" into nyc-dev

8 years agoClear mHasResult if the result is dispatched
Tony Mak [Fri, 18 Mar 2016 18:24:13 +0000 (18:24 +0000)]
Clear mHasResult if the result is dispatched

The bug is because we dispatch the result again in setListener.
We should reset mHasResult if the result is dispatched already.
This bug is actually not work-challenge specific, I can reproduce it
in the setting to change screen lock.

Bug: 27242673
Change-Id: I29d2769a16c53d7103dafe1811bc808d634a8d85

8 years agoMerge "Fix bluetooth device forgetting" into nyc-dev
Jason Monk [Fri, 18 Mar 2016 18:13:47 +0000 (18:13 +0000)]
Merge "Fix bluetooth device forgetting" into nyc-dev

8 years agoFix bluetooth device forgetting
Jason Monk [Fri, 18 Mar 2016 18:11:25 +0000 (14:11 -0400)]
Fix bluetooth device forgetting

Bug: 27476922
Change-Id: I8c5b7076a04185371311fb4ff1c1ba0df0df19dc

8 years agoStops black screen from being displayed on changing Vision Settings in SUW.
Anna Galusza [Fri, 18 Mar 2016 17:18:36 +0000 (10:18 -0700)]
Stops black screen from being displayed on changing Vision Settings in SUW.
Bug: 27328791

Change-Id: Ied247c3a31dfc50c0113667e63aea4a0c771f7bc

8 years agoMerge "Remove emergency info subtitle" into nyc-dev
Maria Garcia Puyol [Fri, 18 Mar 2016 15:37:58 +0000 (15:37 +0000)]
Merge "Remove emergency info subtitle" into nyc-dev

8 years agoMerge "Work challenge background: Fix top padding" into nyc-dev
Abodunrinwa Toki [Fri, 18 Mar 2016 15:30:01 +0000 (15:30 +0000)]
Merge "Work challenge background: Fix top padding" into nyc-dev

8 years agoRemove emergency info subtitle
mariagpuyol [Fri, 18 Mar 2016 15:11:04 +0000 (08:11 -0700)]
Remove emergency info subtitle

Bug:27621394
Change-Id: I9f2dfd1fd4926cb454cc8e4b7e3f100aa724aa76

8 years agoMerge "Revert "Dialog for emergency info"" into nyc-dev
Maria Garcia Puyol [Fri, 18 Mar 2016 15:06:02 +0000 (15:06 +0000)]
Merge "Revert "Dialog for emergency info"" into nyc-dev

8 years agoShould read specific user's password restriction
Tony Mak [Fri, 18 Mar 2016 13:48:16 +0000 (13:48 +0000)]
Should read specific user's password restriction

Bug: 27330307
Bug: 27543548

Change-Id: I385d190bdd8138f7189c657498f6a55bf84668ea

8 years agoMerge "Correctly compose activity name of add-printer and print-settings activity...
Philip P. Moltmann [Fri, 18 Mar 2016 14:26:25 +0000 (14:26 +0000)]
Merge "Correctly compose activity name of add-printer and print-settings activity" into nyc-dev

8 years agoFix location settings crash when work profile is disabled
Ricky Wai [Fri, 11 Mar 2016 09:06:02 +0000 (09:06 +0000)]
Fix location settings crash when work profile is disabled

Bug: 27402597
Change-Id: Iab5f999b67e9f81977142648f90cf31acb8b5f69

8 years agoMerge "Do not connect to KeyChainService when user is not started" into nyc-dev
Ricky Wai [Fri, 18 Mar 2016 14:16:27 +0000 (14:16 +0000)]
Merge "Do not connect to KeyChainService when user is not started" into nyc-dev

8 years agoDo not connect to KeyChainService when user is not started
Ricky Wai [Fri, 11 Mar 2016 07:09:24 +0000 (07:09 +0000)]
Do not connect to KeyChainService when user is not started

Bug: 27418671
Change-Id: Id1bca405e8b0ebea79726f623aaa0c59bce0331c

8 years agoKill ConfirmDeviceCredentialBaseActivity when it is no longer visible
Tony Mak [Fri, 18 Mar 2016 12:20:28 +0000 (12:20 +0000)]
Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible

The problem is because ConfirmDeviceCredentialActivity is not created
again when the new intent is fired. Add no history flag to kill it once
it is not visible. We have the exclude from recent flag anyway, so
finishing it should be fine.

Bug: 27564634
Change-Id: I2e22f3d7a108f8fbad5f27894b1a92f19d25bcda

8 years agoRevert "Dialog for emergency info"
Maria Garcia Puyol [Thu, 17 Mar 2016 22:52:44 +0000 (22:52 +0000)]
Revert "Dialog for emergency info"

This reverts commit ae49edbdfd79c3ccc2ae135690a35f4d57c8aaed.

Change-Id: I01a4b5966b380d967588bd0411e80d6bcd431fd1

8 years agoAdd more policy transparency for wifi settings.
Sudheer Shanka [Thu, 17 Mar 2016 22:35:15 +0000 (15:35 -0700)]
Add more policy transparency for wifi settings.

Show policy transparency dialog if user tries to modify a
wifi configuration locked by device owner.

Bug: 27375948
Change-Id: I504082282f57bc5de9f097e962d195ecd2cc9da4

8 years agoMerge "Follow framework refactoring." into nyc-dev
Jeff Sharkey [Thu, 17 Mar 2016 22:00:21 +0000 (22:00 +0000)]
Merge "Follow framework refactoring." into nyc-dev

8 years agoMerge "Fix string typo." into nyc-dev
Sudheer Shanka [Thu, 17 Mar 2016 21:41:42 +0000 (21:41 +0000)]
Merge "Fix string typo." into nyc-dev

8 years agoMerge "fix build for ag/887244" into nyc-dev
Mahaver Chopra [Thu, 17 Mar 2016 21:37:19 +0000 (21:37 +0000)]
Merge "fix build for ag/887244" into nyc-dev

8 years agoMerge "Add divider below summary text on A11y SUW hub. Bug: 27066012" into nyc-dev
Anna Galusza [Thu, 17 Mar 2016 21:20:33 +0000 (21:20 +0000)]
Merge "Add divider below summary text on A11y SUW hub. Bug: 27066012" into nyc-dev

8 years agoAdd divider below summary text on A11y SUW hub.
Anna Galusza [Thu, 17 Mar 2016 19:55:14 +0000 (12:55 -0700)]
Add divider below summary text on A11y SUW hub.
Bug: 27066012

Change-Id: Ic545a50ec2a0b5b7a40152ea818bd15673c629d2

8 years agofix build for ag/887244
Xiaohui Chen [Thu, 17 Mar 2016 20:38:01 +0000 (13:38 -0700)]
fix build for ag/887244

Change-Id: Iaa57eff6d1c9117d3ed55420712e7c6db6d2aa88

8 years agoFix string typo.
Sudheer Shanka [Thu, 17 Mar 2016 20:18:32 +0000 (13:18 -0700)]
Fix string typo.

Bug: 27627894
Change-Id: I6039acd69363a3827e42e5efda23123af6dfd1c1

8 years agoMerge "Sets the divider style to either for fingerprint." into nyc-dev
Udam Saini [Thu, 17 Mar 2016 19:59:52 +0000 (19:59 +0000)]
Merge "Sets the divider style to either for fingerprint." into nyc-dev

8 years agoWork challenge background: Fix top padding
Abodunrinwa Toki [Thu, 17 Mar 2016 18:48:05 +0000 (18:48 +0000)]
Work challenge background: Fix top padding

Bug: 27693796
Change-Id: Iafda9dfed2b87c3618c155d4434d5895547f6fe0

8 years agoMerge "Fix build" into nyc-dev
Julia Reynolds [Thu, 17 Mar 2016 18:07:48 +0000 (18:07 +0000)]
Merge "Fix build" into nyc-dev

8 years agoFix build
Julia Reynolds [Thu, 17 Mar 2016 17:58:15 +0000 (13:58 -0400)]
Fix build

Bug: 27709695
Change-Id: I2020a33aa0a305e025d7d004df4b23838bb42992

8 years agoMerge "Title text and input bar should be white" into nyc-dev
Mahaver Chopra [Thu, 17 Mar 2016 17:49:34 +0000 (17:49 +0000)]
Merge "Title text and input bar should be white" into nyc-dev

8 years agoMerge "Work Profile Security Challenge: Finalised strings" into nyc-dev
Mahaver Chopra [Thu, 17 Mar 2016 17:48:35 +0000 (17:48 +0000)]
Merge "Work Profile Security Challenge: Finalised strings" into nyc-dev

8 years agoFollow framework refactoring.
Jeff Sharkey [Thu, 17 Mar 2016 17:04:55 +0000 (11:04 -0600)]
Follow framework refactoring.

Bug: 27531029
Change-Id: Iad76ba8ae7aab361f4f3147d9ac268bc480267e7

8 years agoMerge "Fix crash adding an account." into nyc-dev
Julia Reynolds [Thu, 17 Mar 2016 17:30:17 +0000 (17:30 +0000)]
Merge "Fix crash adding an account." into nyc-dev

8 years agoFix crash adding an account.
Julia Reynolds [Thu, 17 Mar 2016 16:56:30 +0000 (12:56 -0400)]
Fix crash adding an account.

Bug: 27709695
Change-Id: I66b69d71ed346e8d6f0d8493e6dd415d81f41ac1

8 years agoMerge changes I21f2bbbf,If9914195,I5a71413f,I85a8ff3a,Ibb3729c9 into nyc-dev
Jason Monk [Thu, 17 Mar 2016 13:30:14 +0000 (13:30 +0000)]
Merge changes I21f2bbbf,If9914195,I5a71413f,I85a8ff3a,Ibb3729c9 into nyc-dev

* changes:
  Fix battery history detail up
  Fix clickability of conditionals
  Try to recycle prefs in battery summary
  Don't use animations for security settings
  Fix Settings home lifecycle

8 years agovpn: check fragment is visible before adding prefs
Robin Lee [Thu, 17 Mar 2016 10:20:29 +0000 (10:20 +0000)]
vpn: check fragment is visible before adding prefs

As VPN settings listens to network events it may get woken up again
while it's in the background.

Bug: 23596799
Change-Id: If6e07493da447d7ded324ff86b6e7d57c5c615e3

8 years agoMerge "Use CheckableLinearLayout for Use USB for dialog's item." into nyc-dev
Daichi Hirono [Thu, 17 Mar 2016 10:05:49 +0000 (10:05 +0000)]
Merge "Use CheckableLinearLayout for Use USB for dialog's item." into nyc-dev

8 years agoUse CheckableLinearLayout for Use USB for dialog's item.
Daichi Hirono [Thu, 17 Mar 2016 06:57:36 +0000 (15:57 +0900)]
Use CheckableLinearLayout for Use USB for dialog's item.

The root of "Use USB for" dialog's item is CheckableLinearLayout, which
defers the check state to direct children. However previously we had
CheckedTextView not just under CheckableLinearLayout. The structure
looks like:

Root CheckableLinearLayout -> LinearLayout -> CheckedTextView

The CL replaces the second child LinearLayout with CheckableLinearLayout
so that we can defer the state to CheckedTextView.

BUG=27708922

Change-Id: If0491235eac0a82bcb07e31856aa6b9535930fb2

8 years agoAdd disabled by policy empty views to more screens.
Sudheer Shanka [Mon, 14 Mar 2016 19:03:40 +0000 (12:03 -0700)]
Add disabled by policy empty views to more screens.

Bug: 27588316
Bug: 27588671
Bug: 27588740
Change-Id: Id614067d76e936e9c3c585fdaed304bfbc88dc74

8 years agoStop using a deprecated constructor of InputMethodSettings.
Yohei Yukawa [Thu, 17 Mar 2016 03:50:28 +0000 (20:50 -0700)]
Stop using a deprecated constructor of InputMethodSettings.

This is a follow up CL to my previous CL [1], which added a new
constructor to InputMethodSettings to support File-Based
Encryption (FBE).

Settings app is the only remaining package that depends on the previous
constructor.  To completely deprecate the previous one, this CL lets the
caller switch to the new constructor.

Note that this CL does not change the initial parameters of
InputMethodSettings.  In other words this is a mechanical code
clean-up.

  [1] I9c6f9bb3d51174198e5f73588637f87ea0d90e11
      5db2f16f15549c490c9541602a96f42bef984acb

Bug: 26279466
Change-Id: I09cba4066b95c4a9e89a3e4f83d75b97882502dc

8 years agoMerge "Show ICCID in SIM status, if CarrierConfigManager allows." into nyc-dev
Meng Wang [Wed, 16 Mar 2016 23:24:40 +0000 (23:24 +0000)]
Merge "Show ICCID in SIM status, if CarrierConfigManager allows." into nyc-dev

8 years agoMerge "Show "no vpns added" for empty vpn screen" into nyc-dev
Robin Lee [Wed, 16 Mar 2016 21:30:53 +0000 (21:30 +0000)]
Merge "Show "no vpns added" for empty vpn screen" into nyc-dev

8 years agoMerge "Don't crash if the backup transport supplies bogus intents" into nyc-dev
Chris Tate [Wed, 16 Mar 2016 21:14:39 +0000 (21:14 +0000)]
Merge "Don't crash if the backup transport supplies bogus intents" into nyc-dev

8 years agoDon't crash if the backup transport supplies bogus intents
Christopher Tate [Wed, 16 Mar 2016 20:45:03 +0000 (13:45 -0700)]
Don't crash if the backup transport supplies bogus intents

Preflight the (activity) intents supplied by the transport so that when
clicked, they don't crash the Preference that called startActivity().

Bug 27689847

Change-Id: I7cbdd6077ac74500ecdf9607310727af56d55a3c

8 years agoFix battery history detail up
Jason Monk [Wed, 16 Mar 2016 20:29:26 +0000 (16:29 -0400)]
Fix battery history detail up

Bug: 27476391
Change-Id: I21f2bbbf4306d36ffa1c4825ecaebd45dca50171

8 years agoShow "no vpns added" for empty vpn screen
Robin Lee [Wed, 16 Mar 2016 12:39:00 +0000 (12:39 +0000)]
Show "no vpns added" for empty vpn screen

Removed the left-alignment on restricted empty views which was
inherited from Bluetooth settings but inconsistent with normal
settings fragments.

Bug: 22685111
Change-Id: I3a36c47d523392b8925031d4cac2ab3ef681e360

8 years agoFix clickability of conditionals
Jason Monk [Wed, 16 Mar 2016 20:25:09 +0000 (16:25 -0400)]
Fix clickability of conditionals

Bug: 27700081
Change-Id: If991419541dd021197ea641f8b2caee5cc16af36

8 years agoTry to recycle prefs in battery summary
Jason Monk [Wed, 16 Mar 2016 19:52:35 +0000 (15:52 -0400)]
Try to recycle prefs in battery summary

Bug: 27404159
Change-Id: I5a71413f22e14b8300b6821da661a613392a06e0

8 years agoDon't use animations for security settings
Jason Monk [Wed, 16 Mar 2016 19:13:19 +0000 (15:13 -0400)]
Don't use animations for security settings

Bug: 27419463
Change-Id: I85a8ff3a7720fcaa33f4883b4fd4e569bcae3be2

8 years agoMerge "Don't set useAdminDisabledSummary when there is already a summary." into nyc-dev
Sudheer Shanka [Wed, 16 Mar 2016 18:49:26 +0000 (18:49 +0000)]
Merge "Don't set useAdminDisabledSummary when there is already a summary." into nyc-dev

8 years agoDon't set useAdminDisabledSummary when there is already a summary.
Sudheer Shanka [Wed, 16 Mar 2016 18:42:58 +0000 (11:42 -0700)]
Don't set useAdminDisabledSummary when there is already a summary.

Bug: 27155568
Change-Id: If2a7bf127307731b2e2258dc6389caed13950f79

8 years agoFix Settings home lifecycle
Jason Monk [Wed, 16 Mar 2016 18:27:12 +0000 (14:27 -0400)]
Fix Settings home lifecycle

Bug: 27330440
Bug: 26268813
Change-Id: Ibb3729c9872be2488db3741ec72ba5a43e66db5f