OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoBidiFormat adapter name for bluetooth_is_visible_message
Roozbeh Pournader [Thu, 16 Jun 2016 01:59:37 +0000 (01:59 +0000)]
BidiFormat adapter name for bluetooth_is_visible_message
am: 77893a4c4b

Change-Id: I2df1050e9b9cb20e369fca56e3e457a3cf2a0397

8 years agoMerge "Show storage manager settings using a system property." into nyc-mr1-dev
Daniel Nishi [Wed, 15 Jun 2016 22:14:08 +0000 (22:14 +0000)]
Merge "Show storage manager settings using a system property." into nyc-mr1-dev

8 years agoBidiFormat adapter name for bluetooth_is_visible_message
Roozbeh Pournader [Wed, 15 Jun 2016 21:37:30 +0000 (14:37 -0700)]
BidiFormat adapter name for bluetooth_is_visible_message

Previously, adapter names which tend to be LTR and may appear at the
beginning of the string could cause the detected bidi direction of the whole
string (which would be RTL in RTL locales) to get miscalculated as LTR.

With this fix, not only the detected bidi direction would be correct,
but also odd adapter names would not impact the bidi layout of the
whole string.

Bug: 28816891
Change-Id: I1d25edbeeff7e9c013bb6c741e7f706431e721dc

8 years agoMerge \"log as counters instead of histograms\" into nyc-dev
Chris Wren [Wed, 15 Jun 2016 18:17:52 +0000 (18:17 +0000)]
Merge \"log as counters instead of histograms\" into nyc-dev
am: 6913b6118f

Change-Id: Ic3178f2514097df73527f446a5daf11fc6c25acc

8 years agoMerge "log as counters instead of histograms" into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 18:13:52 +0000 (18:13 +0000)]
Merge "log as counters instead of histograms" into nyc-dev

8 years agoShow storage manager settings using a system property.
Daniel Nishi [Tue, 14 Jun 2016 00:37:06 +0000 (17:37 -0700)]
Show storage manager settings using a system property.

This removes a Settings-only configuration on whether or not the
storage manager is enabled and replaced it with a system property.

Bug: 29336081
Change-Id: I2328c213f5f11f89bf0fe61e77d3062459036fc3

8 years agoMerge "Update UI style for GLIF buttons" into nyc-mr1-dev
Maurice Lam [Wed, 15 Jun 2016 17:07:54 +0000 (17:07 +0000)]
Merge "Update UI style for GLIF buttons" into nyc-mr1-dev

8 years agoMerge "Fingerprint string updates" into nyc-mr1-dev
Maurice Lam [Wed, 15 Jun 2016 17:07:27 +0000 (17:07 +0000)]
Merge "Fingerprint string updates" into nyc-mr1-dev

8 years agoMerge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
Jason Monk [Wed, 15 Jun 2016 16:59:09 +0000 (16:59 +0000)]
Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
am: b53117f55c

Change-Id: I49ceb02471844e719da35f1939c329f317b6953b

8 years agoMerge "Fix SimStatus updatePhoneInfos" into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 16:48:45 +0000 (16:48 +0000)]
Merge "Fix SimStatus updatePhoneInfos" into nyc-dev

8 years agoMerge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev
Ricky Wai [Wed, 15 Jun 2016 16:38:28 +0000 (16:38 +0000)]
Merge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev
am: 42cbbc3052

Change-Id: Ia46cdcee9c65d7394896e34e216f19dc1e7a5d31

8 years agoMerge "resolve merge conflicts of f4ad443 to nyc-mr1-dev" into nyc-mr1-dev
Jason Monk [Wed, 15 Jun 2016 16:37:16 +0000 (16:37 +0000)]
Merge "resolve merge conflicts of f4ad443 to nyc-mr1-dev" into nyc-mr1-dev

8 years agolog as counters instead of histograms
Chris Wren [Wed, 15 Jun 2016 15:44:16 +0000 (11:44 -0400)]
log as counters instead of histograms

this will interoperate better with UMA

Bug: 26687914
Change-Id: Ie63b2be2d457054c96b070ada3bb92141ab1fb5a

8 years agoMerge "Remove forum link from support tab." into nyc-mr1-dev
Fan Zhang [Wed, 15 Jun 2016 16:15:53 +0000 (16:15 +0000)]
Merge "Remove forum link from support tab." into nyc-mr1-dev

8 years agoMerge "Remove work fingerprints when primary profile lock is removed" into nyc-dev
Ricky Wai [Wed, 15 Jun 2016 16:02:18 +0000 (16:02 +0000)]
Merge "Remove work fingerprints when primary profile lock is removed" into nyc-dev

8 years agoresolve merge conflicts of f4ad443 to nyc-mr1-dev
Jason Monk [Wed, 15 Jun 2016 15:31:14 +0000 (11:31 -0400)]
resolve merge conflicts of f4ad443 to nyc-mr1-dev

Change-Id: I1d8a3f1cb62ee7d5f39e120c613ae45d495f0fb7

8 years agoFix SimStatus updatePhoneInfos
Jason Monk [Wed, 15 Jun 2016 14:23:18 +0000 (10:23 -0400)]
Fix SimStatus updatePhoneInfos

Looks like we got updatePhoneInfos in the right place for IccLockSettings
but not SimStatus.

Also return the right view in onCreateView

Change-Id: Ifd4cbd93351bb05571ed5a9873e9352c7c3a2357
Fixes: 29335528

8 years agoMerge "Make linkify handle emptys urls better DO NOT MERGE" into nyc-dev
Jason Monk [Wed, 15 Jun 2016 14:53:43 +0000 (14:53 +0000)]
Merge "Make linkify handle emptys urls better DO NOT MERGE" into nyc-dev

8 years agoFingerprint string updates
Maurice Lam [Wed, 15 Jun 2016 02:14:37 +0000 (19:14 -0700)]
Fingerprint string updates

Bug: 29119674
Change-Id: I22489507b3c215bac6cf1b3d4e201448be1dc999

8 years agoUpdate UI style for GLIF buttons
Maurice Lam [Wed, 15 Jun 2016 01:35:37 +0000 (18:35 -0700)]
Update UI style for GLIF buttons

Bug: 29105355
Change-Id: I9dfb8b6fb40242298bf1d7caa18cd7fbd2f62725

8 years agoMerge \"Prevent users from blocking system notifications.\" into nyc-dev
Julia Reynolds [Tue, 14 Jun 2016 22:30:19 +0000 (22:30 +0000)]
Merge \"Prevent users from blocking system notifications.\" into nyc-dev
am: b2301cb4c2

Change-Id: I9d5f2f4957bdc86ab25e0436100f5b126cb97bb7

8 years agoMerge "Prevent users from blocking system notifications." into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 22:25:25 +0000 (22:25 +0000)]
Merge "Prevent users from blocking system notifications." into nyc-dev

8 years agoRemove forum link from support tab.
Fan Zhang [Tue, 14 Jun 2016 20:01:45 +0000 (13:01 -0700)]
Remove forum link from support tab.

Bug: 29356288
Change-Id: I95c737d8249eb5689f09e037016832e25bbf9244

8 years agoAlign text for conditions with text for other tiles.
Fan Zhang [Tue, 14 Jun 2016 19:44:48 +0000 (12:44 -0700)]
Align text for conditions with text for other tiles.

Bug: 29107343

Text should be 72dp from left of screen, not 76dp.

Change-Id: I86cb015ed2e574c3f16fb642d7c3653a6f2a017f

8 years agoMerge "Support tab UI polish." into nyc-mr1-dev
Fan Zhang [Tue, 14 Jun 2016 19:26:28 +0000 (19:26 +0000)]
Merge "Support tab UI polish." into nyc-mr1-dev

8 years agoFix bug in Sim Status Settings.
Sanket Padawe [Tue, 14 Jun 2016 18:04:52 +0000 (18:04 +0000)]
Fix bug in Sim Status Settings.
am: fb87919fde

Change-Id: I4bc932a15028e6e24bc62e21f7f5149ce7355899

8 years agoSupport tab UI polish.
Fan Zhang [Mon, 13 Jun 2016 20:50:13 +0000 (13:50 -0700)]
Support tab UI polish.

Bug: 29107343
Bug: 29101595

1) Changing the font weight of the tabs to Medium
2) Changing the tab indicator color
3) Increasing the padding on the top and bottom of the entire suggestion
space (from 6dp to 8dp)
4) Balancing the space of list components within their perspective list
heights
5) Adjusting the padding on the right side to improve alignment
6) Changing "Suggestions" and suggestions counter font weight and size
7) Removing the drop shadow on the bottom of the suggestion space
8) "More help" subheader has been removed
9) Use 54% #000000 as tint color for more help icons.

Change-Id: If3e1c5ce2701422fba6185e7fa340abccc9bd30c

8 years agoFix bug in Sim Status Settings.
Sanket Padawe [Tue, 14 Jun 2016 17:12:39 +0000 (10:12 -0700)]
Fix bug in Sim Status Settings.

Bug: 29332493
Change-Id: Idd519e704ce6fdd0b92319948bdf02c0fa45ff34

8 years agoMerge "Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper...
Sunny Goyal [Tue, 14 Jun 2016 16:51:09 +0000 (16:51 +0000)]
Merge "Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config." into nyc-mr1-dev

8 years agoChanging the WallpaperSuggestionActivity to redirect to the actual
Sunny Goyal [Mon, 13 Jun 2016 22:28:47 +0000 (15:28 -0700)]
Changing the WallpaperSuggestionActivity to redirect to the actual
wallpaper picker component defined in the config.

Bug: 28554244
Change-Id: Iebd38b8fee13608e060acb2b52332014c5c3d87e

8 years agoMerge "Remove "Help & feedback" from toggle screen for accessibility services to...
Anna Galusza [Tue, 14 Jun 2016 16:09:23 +0000 (16:09 +0000)]
Merge "Remove "Help & feedback" from toggle screen for accessibility services to prevent confusion when users are trying to submit feedback for a specific accessibility service (accessibility services can place their own "Help & feedabck" in their apks and route it appropriately). Bug: 29278252" into nyc-mr1-dev

8 years agoRemove work fingerprints when primary profile lock is removed
Ricky Wai [Mon, 13 Jun 2016 14:48:27 +0000 (15:48 +0100)]
Remove work fingerprints when primary profile lock is removed

Bug: 29264034
Change-Id: Ia4043e8a4f4481ff72b8d7069fd139a381158083

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Tue, 14 Jun 2016 12:09:38 +0000 (12:09 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 7221f5b6b4  -s ours

Change-Id: I638873a702599a87476abd1ef92734099dca3c76

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 14 Jun 2016 12:04:54 +0000 (12:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 11:47:33 +0000 (11:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 14 Jun 2016 10:33:30 +0000 (03:33 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 14 Jun 2016 10:17:02 +0000 (03:17 -0700)]
Import translations. DO NOT MERGE

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

8 years agoDND header should be translated.
Julia Reynolds [Tue, 14 Jun 2016 01:57:37 +0000 (01:57 +0000)]
DND header should be translated.
am: 5a67d5f6f0

Change-Id: I238ebd6abe78925fde071b3fb09b27690e6d6311

8 years agoDND header should be translated.
Julia Reynolds [Mon, 13 Jun 2016 16:55:20 +0000 (12:55 -0400)]
DND header should be translated.

Change-Id: Iac764d71e91f5a0dc1b58bfca8a38d823f0598b9
Fixes: 29123731

8 years agoMerge "Added new setting for gestures." into nyc-mr1-dev
TreeHugger Robot [Mon, 13 Jun 2016 22:01:45 +0000 (22:01 +0000)]
Merge "Added new setting for gestures." into nyc-mr1-dev

8 years agoMerge "Use Settings.Secure for days to retain." into nyc-mr1-dev
Daniel Nishi [Mon, 13 Jun 2016 21:18:28 +0000 (21:18 +0000)]
Merge "Use Settings.Secure for days to retain." into nyc-mr1-dev

8 years agoAdded new setting for gestures.
Doris Ling [Tue, 24 May 2016 00:06:26 +0000 (17:06 -0700)]
Added new setting for gestures.

Added a new entry to the top level Settings' Device section to
enable/disable gestures.

Bug: 28565958

Change-Id: Icf642b6a3058c692fb2be9914579996598f03b7d

8 years agoUse Settings.Secure for days to retain.
Daniel Nishi [Fri, 10 Jun 2016 20:56:16 +0000 (13:56 -0700)]
Use Settings.Secure for days to retain.

Previously, we used Shared Preferences, which worked when the
storage manager was localized to Settings. Now that it is in
its own separate APK, we need to use a separate setting to configure
it.

Bug: 28965462
Change-Id: I073859ef1a764679bbc63d3c0cd96af82306212e

8 years agoMerge \"Remove \'You can choose to either trust or remove this certificate\' from...
Michal Karpinski [Mon, 13 Jun 2016 17:40:13 +0000 (17:40 +0000)]
Merge \"Remove \'You can choose to either trust or remove this certificate\' from Check certificate dialog\" into nyc-dev
am: 86c9894f04

Change-Id: I7d2252a50b54c765e2c2a9837ca181861a7bae35

8 years agoMerge "Remove 'You can choose to either trust or remove this certificate' from Check...
TreeHugger Robot [Mon, 13 Jun 2016 17:29:21 +0000 (17:29 +0000)]
Merge "Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog" into nyc-dev

8 years agoMake linkify handle emptys urls better DO NOT MERGE
Jason Monk [Mon, 13 Jun 2016 17:08:32 +0000 (13:08 -0400)]
Make linkify handle emptys urls better DO NOT MERGE

Change-Id: I60029b02e6cda334a8c66ba8453be28b35a818a3
Fixes: 29045818

8 years agoPrevent users from blocking system notifications.
Julia Reynolds [Mon, 13 Jun 2016 16:49:45 +0000 (12:49 -0400)]
Prevent users from blocking system notifications.

Change-Id: I1864d54b01e4db03393078504b8f592ee41ed1c2
Fixes: 29191134

8 years agoMerge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev
Robin Lee [Mon, 13 Jun 2016 16:15:20 +0000 (16:15 +0000)]
Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev
am: cab4f9dc39

Change-Id: Iaab70bd402967dd628958abbbc06a469cea01b49

8 years agoMerge "Respect DISALLOW_CONFIG_VPN for disconnect dialog" into nyc-dev
Robin Lee [Mon, 13 Jun 2016 16:03:54 +0000 (16:03 +0000)]
Merge "Respect DISALLOW_CONFIG_VPN for disconnect dialog" into nyc-dev

8 years agoRemove 'You can choose to either trust or remove this certificate' from Check certifi...
Michal Karpinski [Mon, 13 Jun 2016 15:52:58 +0000 (16:52 +0100)]
Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog

Removing because user might not be able to remove (because the option is disallowed).

Bug: 29102580
Change-Id: I4aaedb2a74742a891e95c65e39d0f702377e6836

8 years agoRespect DISALLOW_CONFIG_VPN for disconnect dialog
Robin Lee [Mon, 13 Jun 2016 13:19:44 +0000 (14:19 +0100)]
Respect DISALLOW_CONFIG_VPN for disconnect dialog

Change-Id: Idfe3899e81eec5efdbd5700bdc65921de6853898
Fix: 29265163

8 years agoMerge \"Fix rendering of policy transparency activity.\" into nyc-dev
Nicolas Prevot [Mon, 13 Jun 2016 12:50:11 +0000 (12:50 +0000)]
Merge \"Fix rendering of policy transparency activity.\" into nyc-dev
am: 98704bc495

Change-Id: I42bba7f5351b214b45255d9e48c3c6802b306b14

8 years agoMerge "Fix rendering of policy transparency activity." into nyc-dev
Nicolas Prévot [Mon, 13 Jun 2016 12:37:05 +0000 (12:37 +0000)]
Merge "Fix rendering of policy transparency activity." into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 11 Jun 2016 04:40:07 +0000 (04:40 +0000)]
Import translations. DO NOT MERGE
am: c66bffa31f  -s ours

Change-Id: I8396507cd5e07b07539beef48ba50a175455478a

8 years agoRemove "Help & feedback" from toggle screen for accessibility services to
Anna Galusza [Thu, 9 Jun 2016 18:22:31 +0000 (11:22 -0700)]
Remove "Help & feedback" from toggle screen for accessibility services to
prevent confusion when users are trying to submit feedback for a specific
accessibility service (accessibility services can place their own "Help &
feedabck" in their apks and route it appropriately).
Bug: 29278252

Change-Id: Ie6f0d92a9ded82eaf3a0ac1122861f26639bc58a

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 10 Jun 2016 20:49:23 +0000 (13:49 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Wi-Fi Calling settings UI update" into nyc-mr1-dev
Meng Wang [Fri, 10 Jun 2016 16:36:46 +0000 (16:36 +0000)]
Merge "Wi-Fi Calling settings UI update" into nyc-mr1-dev

8 years agoMerge \"Fix crash in finish from onCreate.\" into nyc-dev
Jason Monk [Fri, 10 Jun 2016 15:11:24 +0000 (15:11 +0000)]
Merge \"Fix crash in finish from onCreate.\" into nyc-dev
am: 1a1f6b0b1b

Change-Id: Ibd2e867077c2906310dd3b37afe1b9c1ab02de72

8 years agoMerge "Fix crash in finish from onCreate." into nyc-dev
TreeHugger Robot [Fri, 10 Jun 2016 15:06:34 +0000 (15:06 +0000)]
Merge "Fix crash in finish from onCreate." into nyc-dev

8 years agoFix crash in finish from onCreate.
Jason Monk [Fri, 10 Jun 2016 13:49:12 +0000 (09:49 -0400)]
Fix crash in finish from onCreate.

Change-Id: Ia4937fecdc93e30a468b8fefd2f8776186c8e151
Fixes: 29245324

8 years agoMerge \"Fix sentence capitalization of locale names.\" into nyc-dev
Yohei Yukawa [Thu, 9 Jun 2016 23:57:58 +0000 (23:57 +0000)]
Merge \"Fix sentence capitalization of locale names.\" into nyc-dev
am: 294b1586ed

Change-Id: I66b2876c923eed55804e14edc9f73ad619157336

8 years agoMerge "Fix sentence capitalization of locale names." into nyc-dev
Yohei Yukawa [Thu, 9 Jun 2016 23:47:31 +0000 (23:47 +0000)]
Merge "Fix sentence capitalization of locale names." into nyc-dev

8 years agoMerge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into...
Roozbeh Pournader [Thu, 9 Jun 2016 23:07:09 +0000 (23:07 +0000)]
Merge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into nyc-dev
am: 5eddc4bde9

Change-Id: Ia2aee9b0d3ce92b1ceece65d081389a3386c88e7

8 years agoMerge "Use existing localizations for formatting data usage [DO NOT MERGE]" into...
Roozbeh Pournader [Thu, 9 Jun 2016 23:04:21 +0000 (23:04 +0000)]
Merge "Use existing localizations for formatting data usage [DO NOT MERGE]" into nyc-dev

8 years agoMerge \"Don\'t send user to permissions screen if none requested\" into nyc-dev
Svet Ganov [Thu, 9 Jun 2016 22:53:40 +0000 (22:53 +0000)]
Merge \"Don\'t send user to permissions screen if none requested\" into nyc-dev
am: 3e5318496e

Change-Id: I9f04ac2bda5816997e86aa6aee683df3bbfcb74d

8 years agoMerge "Don't send user to permissions screen if none requested" into nyc-dev
Svetoslav Ganov [Thu, 9 Jun 2016 22:45:49 +0000 (22:45 +0000)]
Merge "Don't send user to permissions screen if none requested" into nyc-dev

8 years agoFix sentence capitalization of locale names.
Yohei Yukawa [Thu, 9 Jun 2016 22:01:52 +0000 (15:01 -0700)]
Fix sentence capitalization of locale names.

It turns out that out previous CL [1] is not sufficient to address all
the requests regarding capitalization.

With [1], now InputMethodSubtype#getLocaleDisplayName() returns a locale
name whose capitalization is basically optimized to be used as a list
item.  It works well for list UI, but on a UI element that looks like a
sentence text, we still need to capitalize the first character.

This CL takes care of those UI elements in the Settings app.  This CL
also addresses a remaining TODO about locale-unaware text formatting by
using about android.icu.text.ListFormatter.

  [1]: If105082ce703db7a86738455db7e9fb37f3c6fe8
       e489baf96df2837a3a63b626d9023a4a8b322c28

Bug: 29035638
Change-Id: I59f93f0bc067cdd87c6065c972a7da3cde1128f9

8 years agoUse existing localizations for formatting data usage [DO NOT MERGE]
Roozbeh Pournader [Thu, 9 Jun 2016 04:55:09 +0000 (21:55 -0700)]
Use existing localizations for formatting data usage [DO NOT MERGE]

This partially reverts I5be9bb7ce3b11709117da698d6c03610f4e5e40e in
order to use existing localizations and also avoid hard to localize
strings.

Also, we now bidi wrap the usage value, since it may break in the RTL
locales otherwise.

Bug: 28747101
Change-Id: Ibc03632cccfe671164cfbb670a423ada1177db65

8 years agoFix rendering of policy transparency activity.
Nicolas Prevot [Thu, 9 Jun 2016 10:27:57 +0000 (11:27 +0100)]
Fix rendering of policy transparency activity.

Use the dialog's context instead of the activity
context to inflate the view.

BUG:29172155
Change-Id: I0fb32e3d4bfc522a4c8b6d7a6ed55acd01f97446

8 years agoDon't send user to permissions screen if none requested
Svet Ganov [Thu, 9 Jun 2016 05:32:07 +0000 (22:32 -0700)]
Don't send user to permissions screen if none requested

bug:29105157

Change-Id: I90ef18f41deae9a7cf28192bd47f16c3af262c29

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 9 Jun 2016 14:00:04 +0000 (14:00 +0000)]
Import translations. DO NOT MERGE
am: b43b49c643  -s ours

Change-Id: Ia865b8f152d756c2180b15a2a9de0a667817ab62

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 9 Jun 2016 05:54:47 +0000 (22:54 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 9 Jun 2016 05:38:29 +0000 (22:38 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Moved network settings reset away from Backup & reset." into nyc-mr1-dev
Doris Ling [Wed, 8 Jun 2016 21:35:19 +0000 (21:35 +0000)]
Merge "Moved network settings reset away from Backup & reset." into nyc-mr1-dev

8 years agoresolve merge conflicts of 7f7092c to nyc-mr1-dev
Jason Monk [Wed, 8 Jun 2016 20:19:35 +0000 (16:19 -0400)]
resolve merge conflicts of 7f7092c to nyc-mr1-dev

Change-Id: I27b058bd0cbbc2e253337cc56a1a032df96046de

8 years agoMerge "Remove PreferenceActivity" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:13:05 +0000 (19:13 +0000)]
Merge "Remove PreferenceActivity" into nyc-dev

8 years agoMerge "Fix data usage format strings" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:11:51 +0000 (19:11 +0000)]
Merge "Fix data usage format strings" into nyc-dev

8 years agoMerge "Fix disabling of tiles that are not relevant" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:10:08 +0000 (19:10 +0000)]
Merge "Fix disabling of tiles that are not relevant" into nyc-dev

8 years agoMoved network settings reset away from Backup & reset.
Doris Ling [Wed, 8 Jun 2016 00:56:00 +0000 (17:56 -0700)]
Moved network settings reset away from Backup & reset.

Moved Settings -> Backup & reset -> Network setting reset to
Settings -> Wireless & networks -> More.

Bug: 28683031
Change-Id: I52385ec862789985ccb8647398950605955569f7

8 years agoMerge "Display total storage for Internal shared storage." into nyc-mr1-dev
TreeHugger Robot [Wed, 8 Jun 2016 16:08:11 +0000 (16:08 +0000)]
Merge "Display total storage for Internal shared storage." into nyc-mr1-dev

8 years agoDisplay total storage for Internal shared storage.
Felipe Leme [Wed, 11 May 2016 20:58:41 +0000 (13:58 -0700)]
Display total storage for Internal shared storage.

Prior to this change, Settings was using
volume.getPath().getTotalBytes() to calculate the total, which includes
the user-accessible storage, but not the internal partitions. As such,
the total displayed was often missing many GBs (for example, in a 32GB
device, it could display "12.09GB of 25.01GB used".

This change fix this problem by using the total size and creating a
"System" section containing the "missing" storage.

BUG: 24128505

Change-Id: Ic35cd7c8406eff16ac1d97c4b4c233ecde64a6e1

** Cherrypicked from master - DO NOT MERGE **

8 years agoMerge \"Make work challenge settings work even work profile is not enabled yet\"...
Ricky Wai [Wed, 8 Jun 2016 14:49:06 +0000 (14:49 +0000)]
Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev
am: 68c263cf2e

Change-Id: I091c7a1173b468c9887d247efa517696cbd50da2

8 years agoMerge "Make work challenge settings work even work profile is not enabled yet" into...
Ricky Wai [Wed, 8 Jun 2016 14:34:02 +0000 (14:34 +0000)]
Merge "Make work challenge settings work even work profile is not enabled yet" into nyc-dev

8 years agoRemove PreferenceActivity
Jason Monk [Mon, 6 Jun 2016 20:01:58 +0000 (16:01 -0400)]
Remove PreferenceActivity

Its broken and isn't worth maintaining, instead port the few things
using it over to SettingsPreferenceActivity with wrapping blank
Activities like the rest of Settings.

Change-Id: Ic82f0dcb63ed9b4078f7da6a79c0c52f0130e8d1
Fixes: 28779941

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:36:23 +0000 (13:36 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 09cedc44b4  -s ours

Change-Id: I1af6c2584397a29d5128eea7cdcfb8d8c9c8e0a7

8 years agoMake work challenge settings work even work profile is not enabled yet
Ricky Wai [Tue, 7 Jun 2016 15:54:25 +0000 (16:54 +0100)]
Make work challenge settings work even work profile is not enabled yet

Bug: 29090660
Change-Id: I21996700f1ee451e8420f3f257c6ed51feea4ecb

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:09:21 +0000 (13:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 8 Jun 2016 04:21:26 +0000 (21:21 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29169863
Change-Id: Ibe6c3ae08e13bc4984932908f9a3ae2ca632b26c

8 years agoMerge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
Jim Miller [Wed, 8 Jun 2016 00:38:29 +0000 (00:38 +0000)]
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
am: f8c64089b1

Change-Id: Ib227856dd007197a22b8ef2f27881dddd992b3b8

8 years agoMerge "Move legacy full disk encryption code to Settings." into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 00:31:28 +0000 (00:31 +0000)]
Merge "Move legacy full disk encryption code to Settings." into nyc-dev

8 years agoMove legacy full disk encryption code to Settings.
Jim Miller [Tue, 7 Jun 2016 22:44:46 +0000 (15:44 -0700)]
Move legacy full disk encryption code to Settings.

Fixes bug 27617297

Change-Id: Ib975cf8d4f2e1e7fa8a77550ca4ee8233647e9db

8 years agoFix disabling of tiles that are not relevant
Jason Monk [Tue, 7 Jun 2016 18:02:33 +0000 (14:02 -0400)]
Fix disabling of tiles that are not relevant

 - Fix restricted user tiles being disabled
 - Call new better method in SettingsDrawerActivity for disabling

Change-Id: I2fb6ddd3d505189d2b6d96c0a1039291b80a2f70
Fixes: 29080209

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 7 Jun 2016 03:35:54 +0000 (03:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 7 Jun 2016 03:31:21 +0000 (03:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 48229d7781  -s ours

* commit '48229d77817bbf4c169787bef8faddd77bf890a1':
  Import translations. DO NOT MERGE

Change-Id: Ia9398ea959de34c41ecdf48f47bdf433dd25bf65

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 7 Jun 2016 03:23:12 +0000 (03:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 7 Jun 2016 02:03:01 +0000 (19:03 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 7 Jun 2016 01:48:05 +0000 (18:48 -0700)]
Import translations. DO NOT MERGE

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

8 years agoWi-Fi Calling settings UI update
Meng Wang [Fri, 3 Jun 2016 00:06:22 +0000 (17:06 -0700)]
Wi-Fi Calling settings UI update

Bug: 28404126
Change-Id: Id9c44c0b97d2ef81502a65e9238e47656068db50

8 years agoMerge "Restrict Settings always-on to NYC+" into nyc-dev
Robin Lee [Mon, 6 Jun 2016 21:09:30 +0000 (21:09 +0000)]
Merge "Restrict Settings always-on to NYC+" into nyc-dev
am: 8f2c17e12c

* commit '8f2c17e12c7cd7c293257c74ac32ab435f58eefe':
  Restrict Settings always-on to NYC+

Change-Id: Ic79b72b61a763ab7746c1fa07e705e5e2e410bbf

8 years agoMerge "Restrict Settings always-on to NYC+" into nyc-dev
Robin Lee [Mon, 6 Jun 2016 20:59:00 +0000 (20:59 +0000)]
Merge "Restrict Settings always-on to NYC+" into nyc-dev