OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoMerge "Minor Fixes for RadioInfo Test Menu" into nyc-dev
Nathan Harold [Wed, 13 Apr 2016 07:43:23 +0000 (07:43 +0000)]
Merge "Minor Fixes for RadioInfo Test Menu" into nyc-dev
am: 0887ace

* commit '0887ace34472469003299d782b90c8fd9324bb7e':
  Minor Fixes for RadioInfo Test Menu

Change-Id: Ia7d06a94f81e5f27500bf63a16d95dad6f8d8829

8 years agoMerge "Minor Fixes for RadioInfo Test Menu" into nyc-dev
Nathan Harold [Wed, 13 Apr 2016 07:37:37 +0000 (07:37 +0000)]
Merge "Minor Fixes for RadioInfo Test Menu" into nyc-dev

8 years agoMinor Fixes for RadioInfo Test Menu
Nathan Harold [Wed, 13 Apr 2016 07:29:30 +0000 (00:29 -0700)]
Minor Fixes for RadioInfo Test Menu

-Fix a race condition in re-creating activity
-Ensure cell info is disabled when Menu is paused
-Fix issue with focus on creating view

Change-Id: Icfb7667fe6e47ab6dc950918447bbe892e0681ad

8 years agoMerge "Clearing cache for managed profile apps" into nyc-dev
Suprabh Shukla [Wed, 13 Apr 2016 03:22:27 +0000 (03:22 +0000)]
Merge "Clearing cache for managed profile apps" into nyc-dev
am: 490e40e

* commit '490e40ecc842c2d333657951fd45bea358c816a5':
  Clearing cache for managed profile apps

Change-Id: Id74948c6b55f9b27f8bdcf0ee3cf0fdee323ca0d

8 years agoMerge "Clearing cache for managed profile apps" into nyc-dev
TreeHugger Robot [Wed, 13 Apr 2016 03:13:47 +0000 (03:13 +0000)]
Merge "Clearing cache for managed profile apps" into nyc-dev

8 years agoClearing cache for managed profile apps
Suprabh Shukla [Tue, 12 Apr 2016 22:57:11 +0000 (15:57 -0700)]
Clearing cache for managed profile apps

Added code to loop over all the child profiles and delete application
cache files for them, when clearing cache from Settings->Storage

Bug: b/25338468
Change-Id: I87dba56218402be44b71a009e93b2e93f48a574c

8 years agoMerge "update station to show ranking and autobundles" into nyc-dev
Chris Wren [Tue, 12 Apr 2016 22:44:49 +0000 (22:44 +0000)]
Merge "update station to show ranking and autobundles" into nyc-dev
am: 106d8e5

* commit '106d8e57cee93afbd25587b75455ec78f1853271':
  update station to show ranking and autobundles

Change-Id: I7eb816701684c9d48e450d3f01046eece3c3d5b2

8 years agoMerge "Guard against empty extraInfo" into nyc-dev
Jason Monk [Tue, 12 Apr 2016 22:44:49 +0000 (22:44 +0000)]
Merge "Guard against empty extraInfo" into nyc-dev
am: b63a4f8

* commit 'b63a4f87416bcf3170411fc336529ca8f5d14626':
  Guard against empty extraInfo

Change-Id: Iea0c1172f484554a16d8c718b24f02e9e315ac0e

8 years agoMerge "Work on settings startup speed" into nyc-dev
Jason Monk [Tue, 12 Apr 2016 22:44:49 +0000 (22:44 +0000)]
Merge "Work on settings startup speed" into nyc-dev
am: 1fd25b9

* commit '1fd25b982a5d80a13b4e34e2c3130dd2d7f856a6':
  Work on settings startup speed

Change-Id: Ib1ba9c56085a3a18e691bdda63a62528e0a829e3

8 years agoMerge "Disable animations for bluetooth." into nyc-dev
Jason Monk [Tue, 12 Apr 2016 22:44:48 +0000 (22:44 +0000)]
Merge "Disable animations for bluetooth." into nyc-dev
am: 90886f6

* commit '90886f66f6c27ed3c67c32983aa0214e521e2d24':
  Disable animations for bluetooth.

Change-Id: I7325068e38900c7f1a16a1a8685a941ecc12707b

8 years agoMerge "update station to show ranking and autobundles" into nyc-dev
Chris Wren [Tue, 12 Apr 2016 21:02:15 +0000 (21:02 +0000)]
Merge "update station to show ranking and autobundles" into nyc-dev

8 years agoMerge "Guard against empty extraInfo" into nyc-dev
Jason Monk [Tue, 12 Apr 2016 20:11:16 +0000 (20:11 +0000)]
Merge "Guard against empty extraInfo" into nyc-dev

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 agoGuard against empty extraInfo
Jason Monk [Tue, 12 Apr 2016 20:03:39 +0000 (16:03 -0400)]
Guard against empty extraInfo

Change-Id: Iff297637edd3ebf5b6d26bc1dc51e9c17393e24f
Fixes: 27999693

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 19:07:47 +0000 (19:07 +0000)]
Merge "Add demo mode to dev options" into nyc-dev
am: 7b5c400

* commit '7b5c4007e224a00933029f9874d7d830b8a70742':
  Add demo mode to dev options

Change-Id: I48eefd0ae371f09f8841b1aaa113cea7e208a5a9

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 agoMerge "Auto-link web urls in support messages." into nyc-dev
Sudheer Shanka [Tue, 12 Apr 2016 18:50:28 +0000 (18:50 +0000)]
Merge "Auto-link web urls in support messages." into nyc-dev
am: 67d068e

* commit '67d068e57749fa82ec54794d616a10e0e0a592b1':
  Auto-link web urls in support messages.

Change-Id: I28f26bc84e009c7a199ef9cead16cdbb92d1018c

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

* commit '5cbac8884118d8618da7af4a3a42d7b67bcdb77e':
  Make "Take bugreport" dialog scrollable.

Change-Id: I8e6e3ddb2a96b2fd12756794d39aa275a9e6c98a

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

* commit '0d03c3b524181dd5a6dc0e8db734f1cb32ed8745':
  Fix content description and accessibility focus on PreviewSeekBarPreferenceFragment. Bug: 27911511

Change-Id: I2924e7bd2d26c0b56815ca2dd879e375ae94f48f

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

* commit '858a1c6f202865641c2f79fb919c13c2ae8c6f1a':
  Postpone commit on PreviewSeekBarPreferenceFragment until the cross-fade animation has completed Bug: 27142332

Change-Id: If3caec0fe2bc386b650c6e6f7f6ab3d73ec96b10

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

* commit '0493422de2a6c1f6ed5443ac6ebaa72fc844cef4':
  Always update value of screenshot preference

Change-Id: I9d00cfce4dbd8b9baf8aa4ce103e6dcd11c5496a

8 years agoMerge "Increase string char limit." into nyc-dev
Udam Saini [Tue, 12 Apr 2016 18:50:25 +0000 (18:50 +0000)]
Merge "Increase string char limit." into nyc-dev
am: 7f6ba63

* commit '7f6ba63fcf7692bec0af1a5eec3fe1e77e58a9f9':
  Increase string char limit.

Change-Id: I6ca7f13286ef630b0770b7e67d4ebea8d9d1f395

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 agoMerge "Do not update unified setting before updating primary profile lock" into nyc-dev
Ricky Wai [Tue, 12 Apr 2016 17:11:05 +0000 (17:11 +0000)]
Merge "Do not update unified setting before updating primary profile lock" into nyc-dev
am: 8e91558

* commit '8e91558c0a70a042e0fcbabb8e9c536c9f23b47f':
  Do not update unified setting before updating primary profile lock

Change-Id: Ibd55f7cd0bfce0361494246d3c9ba7cb0f3d0f5d

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:50:32 +0000 (16:50 +0000)]
Merge "Fix switchbar margin" into nyc-dev
am: eb72900

* commit 'eb7290055c377cf9f6136cc609646c0f897587a2':
  Fix switchbar margin

Change-Id: I45abaf3127a7402d473389ece8cba0a12b690605

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

* commit '36ac2a1eab550a69b787ab1df0ab5e11aa6c4687':
  Settings dashboard performance work

Change-Id: Ie777a3437797b17abf1627298f37af0054e785e3

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 16:06:27 +0000 (16:06 +0000)]
Merge "Fix UI issue in Sim Settings screen." into nyc-dev
am: 348a5c4

* commit '348a5c4c35038dd138c94e2c8f629da4e71dcd9d':
  Fix UI issue in Sim Settings screen.

Change-Id: I1c8567506e93e2ab0476da680b7a482c80f6b818

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
Daniel U [Tue, 12 Apr 2016 11:15:24 +0000 (11:15 +0000)]
Merge "Hint user that fingerprint cannot unlock FBE keys" into nyc-dev
am: 2f99770

* commit '2f99770cc178011de27813398364da20283fce47':
  Hint user that fingerprint cannot unlock FBE keys

Change-Id: I74e902c396a54b0bee8886c93eaeb30abdde54c9

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 agoCleanup RadioInfo Test Menu
Nathan Harold [Tue, 12 Apr 2016 01:14:23 +0000 (01:14 +0000)]
Cleanup RadioInfo Test Menu
am: 2b77d74

* commit '2b77d7460ccebd97826529f186596df14050f0ae':
  Cleanup RadioInfo Test Menu

Change-Id: I63f6638893e60e0eef75396d3bee0d8bf223cff1

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 19:06:55 +0000 (19:06 +0000)]
Merge "Fix battery history details" into nyc-dev
am: 43fa74b

* commit '43fa74b9fdaf8398d0c1498311b307fbfea135a0':
  Fix battery history details

Change-Id: I57cc3e650cb9b1d0ff0d786dc6e27179d27107bb

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:48:44 +0000 (18:48 +0000)]
Merge "Fix EBT helper initialization in LabeledSeekBar class" into nyc-dev
am: 6a0b722

* commit '6a0b7229847c6b2afb2a83aa397d23ec36a1df5b':
  Fix EBT helper initialization in LabeledSeekBar class

Change-Id: I8e400e00a4a064dc33f575223a29b01165c1b54a

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:50:37 +0000 (16:50 +0000)]
Merge "Added getProfileIds method returning array of userIds" into nyc-dev
am: 1ef3164

* commit '1ef3164424cf6ac7ab604e9cdf0e1a2c67a7ea89':
  Added getProfileIds method returning array of userIds

Change-Id: I2f64e0079fc57d4e51fd222b9e8835d202e84448

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 agoupdate station to show ranking and autobundles
Chris Wren [Fri, 8 Apr 2016 21:28:01 +0000 (17:28 -0400)]
update station to show ranking and autobundles

Bug: 26919636
Change-Id: I5f1ce737ca2d06e6706c3248bd09bd40ef36774f

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

* commit '3cd935c89c46cdbbe5556823393045081ef6d844':
  Pull pref summaries from power usage summary

Change-Id: Ic512bfb11423a01db290fe941ef8365a53b67d4e

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 agoMerge "Guard against crash in SummaryProvider" into nyc-dev
Jason Monk [Mon, 11 Apr 2016 14:26:50 +0000 (14:26 +0000)]
Merge "Guard against crash in SummaryProvider" into nyc-dev
am: 3095c77

* commit '3095c77d5b28839ff6e757d6c08afd1bd2cd7afa':
  Guard against crash in SummaryProvider

Change-Id: I759042100f3b4f21b9056d83b817634f066fae93

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

* commit 'eeb2a19a50c0fa1792ed163b555d0bddf217080f':
  Remove OpenGL traces from dev settings

Change-Id: Ia36a2187188f103da55e1066754ef764cc90c341

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 14:14:53 +0000 (14:14 +0000)]
Fix localization issues with disabled
am: 9e9ba0d

* commit '9e9ba0d75142c7af9d8f7eabb7dfd34ff59e2064':
  Fix localization issues with disabled

Change-Id: If37b22b8dd44ad42265227b20c449acc97b06bb4

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:55:54 +0000 (09:55 +0000)]
Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev
am: 6599660

* commit '659966019601b64fecd24a80d549b8d870059435':
  Add Keyboard Shortcuts Helper entry in Settings

Change-Id: I99dd51ef8dfdb80a59e003f332988b298e20152c

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 [Sun, 10 Apr 2016 06:36:54 +0000 (06:36 +0000)]
Shorten title name so as not to hit char limit.
am: cf87fd5

* commit 'cf87fd5beda44205a0d87565d2672cf038fbe70e':
  Shorten title name so as not to hit char limit.

Change-Id: I849aacf5c30610a8396146b86b65c9ff612ac29d

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 14:11:35 +0000 (14:11 +0000)]
Import translations. DO NOT MERGE
am: 2f26075  -s ours

* commit '2f260757a2cec3f735d7cc175115cc1f6bee8903':
  Import translations. DO NOT MERGE

Change-Id: I99a3400ce2b1583832c46b20454fc97ecfb78870

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 [Sat, 9 Apr 2016 00:32:15 +0000 (00:32 +0000)]
Merge "Settings tweaks" into nyc-dev
am: db3fcfb

* commit 'db3fcfb7cb652c0afdd093e2ec9f387dc01b7819':
  Settings tweaks

Change-Id: Ibc9882219ad819cd516bf3c1ce7ce556b36ad9e6

8 years agoMerge "Moving HelpUtils to SettingsLib" into nyc-dev
Suprabh Shukla [Sat, 9 Apr 2016 00:32:15 +0000 (00:32 +0000)]
Merge "Moving HelpUtils to SettingsLib" into nyc-dev
am: 1d464b9

* commit '1d464b9677c4f956dab81622b2cb59c53cbf01dd':
  Moving HelpUtils to SettingsLib

Change-Id: I2b855b36d0f3af29f5bc35008017aa7539cd0677

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:11:43 +0000 (17:11 +0000)]
Merge "Restore the premiume SMS Preference." into nyc-dev
am: b8bce66

* commit 'b8bce66c02bef58d9df3bdfe0fc4a29da9491296':
  Restore the premiume SMS Preference.

Change-Id: Id83745add76b1afba24bf487dab12a66ebe4f0c3

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 [Fri, 8 Apr 2016 15:57:44 +0000 (15:57 +0000)]
TrustedCredentialsSettings should be launched in personal user instead of work user
am: 37afa28

* commit '37afa286f926b527c430c312d509eb8ebe7a2593':
  TrustedCredentialsSettings should be launched in personal user instead of work user

Change-Id: I85809994177a3c605e3b3ca4e9d57c7996016566

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

* commit '9f4ad67fad34331aecbdabd4a0193038fa0e9f79':
  Allow user to hide sensitive notifications with no work challenge

Change-Id: I80943b49439532bdb676825ac9a8ee5bc7088b11

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

* commit 'f103d10861e6a702f8f29d42e48214c94b1ddb91':
  Input settings: Show keyboard layout collection.

Change-Id: I813b902c6638befc9dcd7ebd166e8fe9c33731a5

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:58:34 +0000 (10:58 +0000)]
Merge "Credential storage: check lock quality for right user" into nyc-dev
am: 16b4ac8

* commit '16b4ac8a8efb7ea06397ff559984c3c08f275398':
  Credential storage: check lock quality for right user

Change-Id: Iea518cce08617d5ccfa6d5e43d5a65e377631528

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:50:23 +0000 (10:50 +0000)]
Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev
am: 76a2981

* commit '76a29810c30978b958f953c3248fbd4ef19b5f79':
  Improved UX when DISALLOW_SET_WALLPAPER is set.

Change-Id: I354816c172deb4624326128079b50d6de4bf9031

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:18:52 +0000 (05:18 +0000)]
Merge "Fix Settings activity typo." into nyc-dev
am: 77359ad

* commit '77359ad76117c3ffc7fe40890f8bbdc8736f143c':
  Fix Settings activity typo.

Change-Id: Ie11bb09128fbbedc72252583e0a6a721ef1e17bd

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