OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoMerge "Work on settings startup speed" into nyc-dev
Jason Monk [Tue, 12 Apr 2016 20:11:00 +0000 (20:11 +0000)]
Merge "Work on settings startup speed" into nyc-dev

8 years agoWork on settings startup speed
Jason Monk [Tue, 12 Apr 2016 15:35:02 +0000 (11:35 -0400)]
Work on settings startup speed

 - Cut down on amount stored in conditions xml
 - Remove extra work from dashboard startup
 - Move summary to min priority

Change-Id: I51ca3828e4446632d6faa60dcfbab3446d19d335
Fixes: 28134360

8 years agoMerge "Disable animations for bluetooth." into nyc-dev
Jason Monk [Tue, 12 Apr 2016 19:18:47 +0000 (19:18 +0000)]
Merge "Disable animations for bluetooth." into nyc-dev

8 years agoMerge "Add demo mode to dev options" into nyc-dev
Jason Monk [Tue, 12 Apr 2016 18:53:18 +0000 (18:53 +0000)]
Merge "Add demo mode to dev options" into nyc-dev

8 years agoDisable animations for bluetooth.
Jason Monk [Tue, 12 Apr 2016 18:45:41 +0000 (14:45 -0400)]
Disable animations for bluetooth.

Change-Id: I2aa77d8ce91f81b6704b4f91766ee61c79afb2f8
Fixes: 28135206

8 years agoMerge "Auto-link web urls in support messages." into nyc-dev
Sudheer Shanka [Tue, 12 Apr 2016 18:44:40 +0000 (18:44 +0000)]
Merge "Auto-link web urls in support messages." into nyc-dev

8 years agoMerge "Make "Take bugreport" dialog scrollable." into nyc-dev
Felipe Leme [Tue, 12 Apr 2016 18:41:16 +0000 (18:41 +0000)]
Merge "Make "Take bugreport" dialog scrollable." into nyc-dev

8 years agoMerge "Fix content description and accessibility focus on PreviewSeekBarPreferenceFra...
Noah Wang [Tue, 12 Apr 2016 18:38:50 +0000 (18:38 +0000)]
Merge "Fix content description and accessibility focus on PreviewSeekBarPreferenceFragment. Bug: 27911511" into nyc-dev

8 years agoMerge "Postpone commit on PreviewSeekBarPreferenceFragment until the cross-fade anima...
Noah Wang [Tue, 12 Apr 2016 18:38:29 +0000 (18:38 +0000)]
Merge "Postpone commit on PreviewSeekBarPreferenceFragment until the cross-fade animation has completed Bug: 27142332" into nyc-dev

8 years agoMerge "Always update value of screenshot preference" into nyc-dev
Jorim Jaggi [Tue, 12 Apr 2016 18:13:00 +0000 (18:13 +0000)]
Merge "Always update value of screenshot preference" into nyc-dev

8 years agoMerge "Increase string char limit." into nyc-dev
Udam Saini [Tue, 12 Apr 2016 17:42:53 +0000 (17:42 +0000)]
Merge "Increase string char limit." into nyc-dev

8 years agoMake "Take bugreport" dialog scrollable.
Felipe Leme [Tue, 12 Apr 2016 16:39:45 +0000 (09:39 -0700)]
Make "Take bugreport" dialog scrollable.

Without scrolling, such dialog might not fit on small screens, specially
on multi-window environments.

BUG: 28137501
Change-Id: I84ed1ff946d1023712efcf80f15bac4a57966f19

8 years agoAdd demo mode to dev options
Jason Monk [Tue, 12 Apr 2016 17:09:13 +0000 (13:09 -0400)]
Add demo mode to dev options

Change-Id: I8c12dc55aef99b54d8d12f7d34e69ca77408f5b2
Fixes: 27919212

8 years agoMerge "Do not update unified setting before updating primary profile lock" into nyc-dev
Ricky Wai [Tue, 12 Apr 2016 16:57:03 +0000 (16:57 +0000)]
Merge "Do not update unified setting before updating primary profile lock" into nyc-dev

8 years agoMerge "Fix switchbar margin" into nyc-dev
Jason Monk [Tue, 12 Apr 2016 16:38:08 +0000 (16:38 +0000)]
Merge "Fix switchbar margin" into nyc-dev

8 years agoMerge "Settings dashboard performance work" into nyc-dev
Jason Monk [Tue, 12 Apr 2016 16:35:43 +0000 (16:35 +0000)]
Merge "Settings dashboard performance work" into nyc-dev

8 years agoFix switchbar margin
Jason Monk [Tue, 12 Apr 2016 16:35:01 +0000 (12:35 -0400)]
Fix switchbar margin

All screens have an up arrow or a drawer icon so the switchbar should
always have the subsettings margin.

Change-Id: If016dc718612d1a26c4e01a5e3f6c8f2f88c6fc1
Fixes: 27599891

8 years agoDo not update unified setting before updating primary profile lock
Ricky Wai [Tue, 12 Apr 2016 16:34:59 +0000 (17:34 +0100)]
Do not update unified setting before updating primary profile lock

Bug: 28135945
Change-Id: Ib6332f42d3b6416d8fd08d5f829bf9852fa0e9f0

8 years agoMerge "Fix UI issue in Sim Settings screen." into nyc-dev
Sanket Padawe [Tue, 12 Apr 2016 15:58:06 +0000 (15:58 +0000)]
Merge "Fix UI issue in Sim Settings screen." into nyc-dev

8 years agoSettings dashboard performance work
Jason Monk [Tue, 12 Apr 2016 14:32:20 +0000 (10:32 -0400)]
Settings dashboard performance work

 - Don't block main thread with rebuild work
 - Don't run rebuild as foreground priority
 - Don't use comparator on apps/notifications summaries, we don't
   care about order
 - Simplify dashboard item layout

Change-Id: I33bdd06a234ea308b44b45cac5ed1e9eac1c7d43
Fixes: 26541310

8 years agoMerge "Hint user that fingerprint cannot unlock FBE keys" into nyc-dev
Ricky Wai [Tue, 12 Apr 2016 11:06:25 +0000 (11:06 +0000)]
Merge "Hint user that fingerprint cannot unlock FBE keys" into nyc-dev

8 years agoAlways update value of screenshot preference
Jorim Jaggi [Tue, 12 Apr 2016 02:17:59 +0000 (19:17 -0700)]
Always update value of screenshot preference

Bug: 26014678
Change-Id: I6127dee5c911171bc9b708dfe1e9ee21b17d0833

8 years agoPostpone commit on PreviewSeekBarPreferenceFragment
Noah Wang [Sun, 10 Apr 2016 10:57:24 +0000 (03:57 -0700)]
Postpone commit on PreviewSeekBarPreferenceFragment
until the cross-fade animation has completed
Bug: 27142332

Change-Id: I6c11e89398bad34a3b92560cb73c667a3cfd4786

8 years agoCleanup RadioInfo Test Menu
Nathan Harold [Sat, 19 Mar 2016 20:22:10 +0000 (13:22 -0700)]
Cleanup RadioInfo Test Menu

-Convert multi-mode buttons to toggle switches to reduce
 confusion.
-Remove long-deprecated PhoneStateIntentReceiver references
 and convert all functions to use PhoneStateListener
-Remove vestigial menu items that no longer reference working
 system properties or code
-Add new ARFCN/UARFCN/EARFCN fields to CellInfo Display
-Convert CellInfoListRate to a Dropdown menu
-Fixed bugs with screen rotation that caused network preferences
 to change (and could crash the radio)
-Fixed bugs related to onResume not updating values correctly
-Re-ordered menu items to group like-items together
-Minor string edits for clarity, correctness, and consistency

Change-Id: Ied5ed7a250682ee3327e51884d80ee4f3a7eb913

8 years agoFix content description and accessibility focus on
Noah Wang [Sun, 10 Apr 2016 06:24:47 +0000 (23:24 -0700)]
Fix content description and accessibility focus on
PreviewSeekBarPreferenceFragment.
Bug: 27911511

Change-Id: I45673e582a29028cb0598669b0fa1a48c071181d

8 years agoMerge "Fix battery history details" into nyc-dev
Jason Monk [Mon, 11 Apr 2016 18:58:25 +0000 (18:58 +0000)]
Merge "Fix battery history details" into nyc-dev

8 years agoFix battery history details
Jason Monk [Mon, 11 Apr 2016 18:55:34 +0000 (14:55 -0400)]
Fix battery history details

Change-Id: Ibf73d28d227574cba0866accdf7c9dc810b24906
Fixes: 27844566

8 years agoMerge "Fix EBT helper initialization in LabeledSeekBar class" into nyc-dev
Alan Viverette [Mon, 11 Apr 2016 18:32:22 +0000 (18:32 +0000)]
Merge "Fix EBT helper initialization in LabeledSeekBar class" into nyc-dev

8 years agoMerge "Added getProfileIds method returning array of userIds" into nyc-dev
Fyodor Kupolov [Mon, 11 Apr 2016 16:40:54 +0000 (16:40 +0000)]
Merge "Added getProfileIds method returning array of userIds" into nyc-dev

8 years agoMerge "Pull pref summaries from power usage summary" into nyc-dev
Jason Monk [Mon, 11 Apr 2016 14:28:23 +0000 (14:28 +0000)]
Merge "Pull pref summaries from power usage summary" into nyc-dev

8 years agoPull pref summaries from power usage summary
Jason Monk [Mon, 11 Apr 2016 14:25:04 +0000 (10:25 -0400)]
Pull pref summaries from power usage summary

Change-Id: I9bd3d1041576e183e7e5e03aaecc5128ea5227c2
Fixes: 27644604

8 years agoMerge "Guard against crash in SummaryProvider" into nyc-dev
Jason Monk [Mon, 11 Apr 2016 14:23:36 +0000 (14:23 +0000)]
Merge "Guard against crash in SummaryProvider" into nyc-dev

8 years agoGuard against crash in SummaryProvider
Jason Monk [Mon, 11 Apr 2016 14:21:28 +0000 (10:21 -0400)]
Guard against crash in SummaryProvider

Change-Id: Ieeae65e50211618dbbee3d320cae614ac5926543
Fixes: 26310547

8 years agoMerge "Remove OpenGL traces from dev settings" into nyc-dev
Jason Monk [Mon, 11 Apr 2016 14:19:55 +0000 (14:19 +0000)]
Merge "Remove OpenGL traces from dev settings" into nyc-dev

8 years agoRemove OpenGL traces from dev settings
Jason Monk [Mon, 11 Apr 2016 14:17:53 +0000 (10:17 -0400)]
Remove OpenGL traces from dev settings

Change-Id: I43a23e5e7bf02b798f3ddffdf4c21077ef3d5e2f
Fixes: 26741446

8 years agoFix localization issues with disabled
Jason Monk [Mon, 11 Apr 2016 13:58:55 +0000 (09:58 -0400)]
Fix localization issues with disabled

Change-Id: Iba63b50000f546a1e323c855462841e82fce4df8
Fixes: 27948378

8 years agoMerge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev
Clara Bayarri [Mon, 11 Apr 2016 09:44:20 +0000 (09:44 +0000)]
Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev

8 years agoShorten title name so as not to hit char limit.
Yohei Yukawa [Sat, 9 Apr 2016 23:57:24 +0000 (16:57 -0700)]
Shorten title name so as not to hit char limit.

This is a follow up CL to my previous CL [1], which tried to rename a
settings item "Add virtual keyboard" but ended up with hitting char
limit in many languages.  We decided to use "Manage keyboards" instead
so as not to hit char limit.

 [1]: Id2ae61519152bbe622aa5915f728a4cbbc49e078
      611410a8c4b55b0fc6fde3e718f028335dea41d8

Bug: 27543291
Bug: 27959401
Change-Id: I6e4795f8c4dbe9857d036ca19689e05658aa0640

8 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 9 Apr 2016 13:46:45 +0000 (06:46 -0700)]
Import translations. DO NOT MERGE

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

8 years agoFix EBT helper initialization in LabeledSeekBar class
Alan Viverette [Fri, 8 Apr 2016 19:23:29 +0000 (15:23 -0400)]
Fix EBT helper initialization in LabeledSeekBar class

Helper should have same lifecycle as the class itself. Also rearranges
class to match up with standard Android class organization.

Bug: 27674946
Change-Id: Ib2ab1e367d4ef1757321375bbb7e4c5f0dc8f46c

8 years agoMerge "Settings tweaks" into nyc-dev
Jason Monk [Fri, 8 Apr 2016 20:46:49 +0000 (20:46 +0000)]
Merge "Settings tweaks" into nyc-dev

8 years agoSettings tweaks
Jason Monk [Fri, 8 Apr 2016 18:54:17 +0000 (14:54 -0400)]
Settings tweaks

Change-Id: I68829fa8e49534d4635a008c94dced3c7ab6f4b1
Fixes: 27834471
Fixes: 27834626
Fixes: 27567838
Fixes: 27834676

8 years agoMerge "Moving HelpUtils to SettingsLib" into nyc-dev
Suprabh Shukla [Fri, 8 Apr 2016 19:31:36 +0000 (19:31 +0000)]
Merge "Moving HelpUtils to SettingsLib" into nyc-dev

8 years agoMerge "Restore the premiume SMS Preference." into nyc-dev
Jason Monk [Fri, 8 Apr 2016 17:04:43 +0000 (17:04 +0000)]
Merge "Restore the premiume SMS Preference." into nyc-dev

8 years agoRestore the premiume SMS Preference.
Jason Monk [Mon, 28 Mar 2016 19:36:03 +0000 (15:36 -0400)]
Restore the premiume SMS Preference.

Fixes: 27657256
Change-Id: I396eb9ba71f51fed517d7f958873369bc0ab011e

8 years agoTrustedCredentialsSettings should be launched in personal user instead of work user
Victor Chang [Thu, 7 Apr 2016 20:20:38 +0000 (21:20 +0100)]
TrustedCredentialsSettings should be launched in personal user instead of work user

Bug: 18224038
Change-Id: I861a0b98b4b7f0792332b980c1c8e080864b4d57

8 years agoMerge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev
Daniel U [Fri, 8 Apr 2016 15:44:44 +0000 (15:44 +0000)]
Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev

8 years agoMerge "Input settings: Show keyboard layout collection." into nyc-dev
Abodunrinwa Toki [Fri, 8 Apr 2016 15:43:13 +0000 (15:43 +0000)]
Merge "Input settings: Show keyboard layout collection." into nyc-dev

8 years agoHint user that fingerprint cannot unlock FBE keys
Daniel U [Thu, 7 Apr 2016 18:18:26 +0000 (19:18 +0100)]
Hint user that fingerprint cannot unlock FBE keys

Show a hint text to user noting that pattern/PIN/password is
required when decrypting the credential based storage when file
based encryption is turned on.

The hint text is the same as that of the device unlock screen after
device reboot.

Bug: 27964055
Change-Id: I0d5a493bab69eae5ce4742bd07d4851387863cac

8 years agoInput settings: Show keyboard layout collection.
Abodunrinwa Toki [Fri, 8 Apr 2016 13:08:56 +0000 (14:08 +0100)]
Input settings: Show keyboard layout collection.

E.g. Android keyboard or Nexus Compat keyboard.

Bug: 27250977
Change-Id: Icd256a760b157418f52046f10ca272561b692838

8 years agoMerge "Credential storage: check lock quality for right user" into nyc-dev
Robin Lee [Fri, 8 Apr 2016 10:53:23 +0000 (10:53 +0000)]
Merge "Credential storage: check lock quality for right user" into nyc-dev

8 years agoMerge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev
Oleksandr Peletskyi [Fri, 8 Apr 2016 10:44:05 +0000 (10:44 +0000)]
Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev

8 years agoImproved UX when DISALLOW_SET_WALLPAPER is set.
Oleksandr Peletskyi [Tue, 5 Apr 2016 13:37:07 +0000 (15:37 +0200)]
Improved UX when DISALLOW_SET_WALLPAPER is set.

Changed type of Settings > Display > Wallpeper menu item
to RestrictedPreference. This allows to show the reason,
why the Wallpaper menu item is blocked.

BUG: 27914814
Change-Id: I6eb23ec9fcaa39bb7e45d020a5aaca0d83cef81f

8 years agoMerge "Fix Settings activity typo." into nyc-dev
Ruben Brunk [Fri, 8 Apr 2016 05:13:18 +0000 (05:13 +0000)]
Merge "Fix Settings activity typo." into nyc-dev

8 years agoFix Settings activity typo.
Ruben Brunk [Fri, 8 Apr 2016 04:45:41 +0000 (21:45 -0700)]
Fix Settings activity typo.

Bug=28078304

Change-Id: I2744314bbd97b1c330baa53a07534c461dab3c0f

8 years agoAdded getProfileIds method returning array of userIds
Fyodor Kupolov [Thu, 7 Apr 2016 23:46:18 +0000 (16:46 -0700)]
Added getProfileIds method returning array of userIds

Previously many usages of UserManager.getProfiles and getEnabledProfiles
were only using ids of returned users. Given that the list of users needs
to be parceled and unparceled for Binder calls, returning array of ids
minimizes memory usage and serialization time.

A new method getProfileIds was introduced which returns an array of userIds.
Existing method calls were updated where appropriate.

Bug: 27705805
Change-Id: Ib042f38d53d95d3b07cda7f824e5cb8c06cd10f5

8 years agoTeach settings about PASSWORD_QUALITY_MANAGED constant
Toni Barzic [Wed, 30 Mar 2016 18:43:19 +0000 (11:43 -0700)]
Teach settings about PASSWORD_QUALITY_MANAGED constant

Add hooks for adding an option for selecting a managed password as
lock credential. By default this option will not be visible.

BUG=27923581

Change-Id: Id17bd8074bf23cbcffb96d8576cc760df6f2298a

8 years agoFix UI issue in Sim Settings screen.
Sanket Padawe [Thu, 7 Apr 2016 16:43:03 +0000 (09:43 -0700)]
Fix UI issue in Sim Settings screen.

+ Preference screen for Sim card selection should be enabled when 1)sim
 count > 1. 2) no default is set for Sms & Data & sim count >= 1

Bug: 27637607
Change-Id: Idb7207316a7bf9aab119ec6568038990623ba514

8 years agoFix work profile screen timeout policy
Ricky Wai [Fri, 18 Mar 2016 16:26:35 +0000 (16:26 +0000)]
Fix work profile screen timeout policy

Settings screen should apply both primary and managed maximum
timeout policy, even separate profile challenge is enabled.

Bug: 27493348
Change-Id: I09e815d6c6ae6ecd554316cfac82daf0ad0b0cdf

8 years agoDelete all work fingerprints when unified lock changes to None/Swipe
Ricky Wai [Wed, 6 Apr 2016 14:28:28 +0000 (15:28 +0100)]
Delete all work fingerprints when unified lock changes to None/Swipe

Bug: 27551139
Change-Id: I64105621057e04be0e4d8073626ac3ed0f1e72d2

8 years agoFingerprint should confirm device lock when unified
Ricky Wai [Tue, 5 Apr 2016 15:33:47 +0000 (16:33 +0100)]
Fingerprint should confirm device lock when unified

When unified and adding a fingerprint, the user is prompted to set up
a backup

Bug:27419438
Change-Id: I6cfa8c276ae69a0af51580be390c3da4e9596874

8 years agoKeymaster init for work profile
Ricky Wai [Fri, 1 Apr 2016 15:31:56 +0000 (16:31 +0100)]
Keymaster init for work profile

Changes:
(1) When unified work challenge is enabled and screen lock is secure
  - Store work profile secure key in primary profile
  - When primary user keystore unlocked, unlock work profile keystore
  - When primary user change lock to none, remove work secure key
(2) When unified work challenge is enabled but screen lock is not secure
  - When screen lock changes to secure, store work secure key in primary
(3) When user changes work challenge from unified to separated
  - Remove work secure key in primary
(4) When user changes work challenge from separate to unified
  - Do (1) and (2)

Bug: 27460698

Change-Id: Id7464c178e6ea7b561643477e7cd84f963048c87

8 years agoCredential storage: check lock quality for right user
Robin Lee [Thu, 7 Apr 2016 13:55:06 +0000 (14:55 +0100)]
Credential storage: check lock quality for right user

Checking the wrong user can lead to an infinite loop when trying to
install credentials from a managed profile.

Bug: 28043334
Change-Id: I3e1044069f0d5139a47de461996a6d98e0fe5e2f

8 years agoMerge "Guard double-showing of user credentials dialog" into nyc-dev
Robin Lee [Thu, 7 Apr 2016 13:32:52 +0000 (13:32 +0000)]
Merge "Guard double-showing of user credentials dialog" into nyc-dev

8 years agoGuard double-showing of user credentials dialog
Robin Lee [Thu, 7 Apr 2016 12:17:24 +0000 (13:17 +0100)]
Guard double-showing of user credentials dialog

Only create & show the dialogfragment if it does not already exist.

Bug: 28058930
Change-Id: Ia48cc8a5fd60a12c3beb6c9263036a449cf8d67c

8 years agoAmend icon size for delete work profile dialog
Winston Man [Wed, 6 Apr 2016 20:33:47 +0000 (21:33 +0100)]
Amend icon size for delete work profile dialog

Changes are referenced from
https://cs.corp.google.com/android/packages/apps/ManagedProvisioning/res/layout/device_manager_icon_label.xml

Fixed screenshot:
https://screenshot.googleplex.com/01qOjUp0rp8

Bug:27636781

Change-Id: Ib6cf303caa388a8b0d2b7664fd9828a8d2f67098

8 years agoMerge "Ask the user to unlock the work profile before adding a work account." into...
Nicolas Prévot [Thu, 7 Apr 2016 09:23:18 +0000 (09:23 +0000)]
Merge "Ask the user to unlock the work profile before adding a work account." into nyc-dev

8 years agoMerge "Fix user photo popup layout for RTL" into nyc-dev
Suprabh Shukla [Thu, 7 Apr 2016 00:56:04 +0000 (00:56 +0000)]
Merge "Fix user photo popup layout for RTL" into nyc-dev

8 years agoFix user photo popup layout for RTL
Ryoji Miyazaki [Tue, 1 Mar 2016 06:13:36 +0000 (15:13 +0900)]
Fix user photo popup layout for RTL

When RTL language is set, the edit-photo popup window
on user profile info is not shown fully.
The popup window should be aligned with the anchor.
Cherrypick of https://android-review.googlesource.com/#/c/207762/

Bug: 27955356
Change-Id: Ia928c99fbfff3596b048cc3949aef6d03594fed7

8 years agoMerge "handle devices that don't support FLASH_LOCK_STATE" into nyc-dev
Andres Morales [Thu, 7 Apr 2016 00:00:37 +0000 (00:00 +0000)]
Merge "handle devices that don't support FLASH_LOCK_STATE" into nyc-dev

8 years agohandle devices that don't support FLASH_LOCK_STATE
Andres Morales [Wed, 6 Apr 2016 20:22:08 +0000 (13:22 -0700)]
handle devices that don't support FLASH_LOCK_STATE

only disable OEM unlocking pref for devices that report
FLASH_LOCK_UNLOCKED.

Bug: 27967926
Change-Id: Ia41b0dc9249e11df2fb35263ebde05f3a2e0d29a

8 years agoAuto-link web urls in support messages.
Sudheer Shanka [Tue, 5 Apr 2016 18:09:59 +0000 (11:09 -0700)]
Auto-link web urls in support messages.

Fixes: 28019243
Change-Id: Ifc4400cf037286d3cdd6b7ac78cefb58f2af400f

8 years agoMerge "Update fingerprint strings during setup" into nyc-dev
Maurice Lam [Wed, 6 Apr 2016 21:34:34 +0000 (21:34 +0000)]
Merge "Update fingerprint strings during setup" into nyc-dev

8 years agoUpdate fingerprint strings during setup
Maurice Lam [Wed, 6 Apr 2016 19:21:54 +0000 (12:21 -0700)]
Update fingerprint strings during setup

Bug: 28004437
Change-Id: I317437ddaf66158e0d30da6d411d9aa7f498688c

8 years agoMerge "Fix animation when expand conditional notices in Settings." into nyc-dev
Fan Zhang [Wed, 6 Apr 2016 19:07:10 +0000 (19:07 +0000)]
Merge "Fix animation when expand conditional notices in Settings." into nyc-dev

8 years agoMerge "Revert "Fix issues with wrong configuration being used to inflate layouts...
Anna Galusza [Wed, 6 Apr 2016 17:47:09 +0000 (17:47 +0000)]
Merge "Revert "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" Framework bug was fixed by ag/900274, so this is no longer needed." into nyc-dev

8 years agoMerge "Use normal button style for Clear data / cache buttons" into nyc-dev
Alan Viverette [Wed, 6 Apr 2016 17:36:35 +0000 (17:36 +0000)]
Merge "Use normal button style for Clear data / cache buttons" into nyc-dev

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

8 years agoFix animation when expand conditional notices in Settings.
Fan Zhang [Tue, 5 Apr 2016 20:21:52 +0000 (13:21 -0700)]
Fix animation when expand conditional notices in Settings.

Bug: 28017593
Change-Id: I8275cb2050f79d26e58c02ffd91cb1a3e32a5ff2

8 years agoMerge "Fix problem with message indent. b/25054130" into nyc-dev
Pankaj Kanwar [Wed, 6 Apr 2016 16:58:09 +0000 (16:58 +0000)]
Merge "Fix problem with message indent. b/25054130" into nyc-dev

8 years agoFix problem with message indent.
pkanwar [Wed, 6 Apr 2016 02:05:10 +0000 (19:05 -0700)]
Fix problem with message indent.
b/25054130

Change-Id: I16327683f970c5b9a23316984e1815227d265c57

8 years agoAdd Keyboard Shortcuts Helper entry in Settings
Clara Bayarri [Fri, 1 Apr 2016 13:36:35 +0000 (14:36 +0100)]
Add Keyboard Shortcuts Helper entry in Settings

Bug: 27811273
Change-Id: Ic4a97c869d6476bf427e41023dc595b39589e6ce

8 years agoMerge "Add dev options to set swXdp" into nyc-dev
Jason Monk [Wed, 6 Apr 2016 13:20:07 +0000 (13:20 +0000)]
Merge "Add dev options to set swXdp" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 6 Apr 2016 12:47:27 +0000 (05:47 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Add button to trust a CA cert" into nyc-dev
Victor Chang [Wed, 6 Apr 2016 10:59:19 +0000 (10:59 +0000)]
Merge "Add button to trust a CA cert" into nyc-dev

8 years agoAsk the user to unlock the work profile before adding a work account.
Nicolas Prevot [Wed, 6 Apr 2016 10:19:08 +0000 (11:19 +0100)]
Ask the user to unlock the work profile before adding a work account.

If the work profile is locked, and the user tries to add a
work account from Settings:
Show the work profile security challenge.

BUG:28005200
Change-Id: I87ff25d9de94026b0d7ac307ea3a541e77989aa6

8 years agoMerge "Block "Screen lock" menu for Work Challenge." into nyc-dev
Oleksandr Peletskyi [Wed, 6 Apr 2016 09:31:22 +0000 (09:31 +0000)]
Merge "Block "Screen lock" menu for Work Challenge." into nyc-dev

8 years agoMerge "PBAP Pairing Permission" into nyc-dev
Sanket Agarwal [Tue, 5 Apr 2016 23:39:55 +0000 (23:39 +0000)]
Merge "PBAP Pairing Permission" into nyc-dev

8 years agoMerge "Do not store bitmap into Bundle in onSaveInstanceState" into nyc-dev
Fyodor Kupolov [Tue, 5 Apr 2016 22:20:16 +0000 (22:20 +0000)]
Merge "Do not store bitmap into Bundle in onSaveInstanceState" into nyc-dev

8 years agoMoving HelpUtils to SettingsLib
Suprabh Shukla [Tue, 5 Apr 2016 21:37:20 +0000 (14:37 -0700)]
Moving HelpUtils to SettingsLib

Moved HelpUtils to SettingsLib in frameworks/base so it can be shared by
packageinstaller as well.

Bug: b/22096093
Change-Id: I8d620abcde8279a3b4d11bbcff8ae9b6f46a1895

8 years agoAdd button to trust a CA cert
Victor Chang [Mon, 4 Apr 2016 18:10:28 +0000 (19:10 +0100)]
Add button to trust a CA cert

- Put Disable button for system cert and Remove button for user cert as action button in cert dialog
- OK (dismiss) button is displayed when trust button is not shown
- Showing chain of cert dialot will be in a later CL

Bug: 18224038
Change-Id: Ieef70e12fd8bdf711be48dc0488f03dbe143d3c5

8 years agoAdd dev options to set swXdp
Jason Monk [Tue, 5 Apr 2016 19:45:27 +0000 (15:45 -0400)]
Add dev options to set swXdp

Change-Id: Ibe88e2b1a2e818838baf452b6da204fc9e004a42
Fixes: 27734698

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 5 Apr 2016 18:44:35 +0000 (18:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 5 Apr 2016 18:25:39 +0000 (11:25 -0700)]
Import translations. DO NOT MERGE

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

8 years agoDo not store bitmap into Bundle in onSaveInstanceState
Fyodor Kupolov [Tue, 5 Apr 2016 17:46:20 +0000 (10:46 -0700)]
Do not store bitmap into Bundle in onSaveInstanceState

It may cause TransactionTooLargeException because of the parcel size limit

Bug: 27990767
Change-Id: Ie1a702810a5c26e25fc485ebae09dc65e2b48e41

8 years agoMerge "Add Tron Logging to portion of A11y SUW that lives in Settings. Bug: 27777706...
Anna Galusza [Tue, 5 Apr 2016 16:46:29 +0000 (16:46 +0000)]
Merge "Add Tron Logging to portion of A11y SUW that lives in Settings. Bug: 27777706" into nyc-dev

8 years agoMerge "Update data saver icon" into nyc-dev
Jason Monk [Tue, 5 Apr 2016 16:38:38 +0000 (16:38 +0000)]
Merge "Update data saver icon" into nyc-dev

8 years agoUpdate data saver icon
Jason Monk [Tue, 5 Apr 2016 16:36:24 +0000 (12:36 -0400)]
Update data saver icon

Change-Id: I9ffd81224da2601a9c4618da04a058da1c08d38e
Fixes: 28004364

8 years agoMerge "Listen on new broadcasts for profile changes." into nyc-dev
Rubin Xu [Tue, 5 Apr 2016 14:52:00 +0000 (14:52 +0000)]
Merge "Listen on new broadcasts for profile changes." into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 5 Apr 2016 03:22:40 +0000 (03:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev