OSDN Git Service

android-x86/packages-apps-Settings.git
7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af...
Maurice Lam [Tue, 6 Sep 2016 23:18:46 +0000 (23:18 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952 am: 94a0fa5759
am: 746dff40ba  -s ours

Change-Id: I304081ab8e9ddaeb48af51cc07c4d3e131e7b13b

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af...
Maurice Lam [Tue, 6 Sep 2016 23:14:25 +0000 (23:14 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af am: d278da7952
am: 94a0fa5759

Change-Id: I76460eee64ad7bc84d67379dc4f952deb2232130

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af
Maurice Lam [Tue, 6 Sep 2016 23:11:17 +0000 (23:11 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af
am: d278da7952

Change-Id: I771b15c4c94314f7fb3f1d3d3734b0c97a35f782

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
Maurice Lam [Tue, 6 Sep 2016 23:08:45 +0000 (23:08 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
am: c94f2b93af

Change-Id: Ib66b9b9d6b97fe1299a24b0c92991b4bd6a46656

7 years agoMerge "Null check intent before starting "learn more"." into nyc-dev
TreeHugger Robot [Tue, 6 Sep 2016 23:07:26 +0000 (23:07 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-dev

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
Maurice Lam [Fri, 2 Sep 2016 23:34:38 +0000 (16:34 -0700)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE

Remove the learn more link during setup wizard, because HelpUtils is
returning null for the intent while the device is not provisioned.

Bug: 31246856
Change-Id: I4cf5c282f170188aef98a02d3b96af5e63ea7f39

7 years agoRemove help links when device is not provisioned. DO NOT MERGE
Maurice Lam [Fri, 2 Sep 2016 00:10:59 +0000 (17:10 -0700)]
Remove help links when device is not provisioned. DO NOT MERGE

Bug: 31246856
Change-Id: Id638de8ab1c6b815d62916a584892be84cabe1ae

7 years agoNull check intent before starting "learn more".
Andrew Sapperstein [Tue, 3 May 2016 01:28:21 +0000 (18:28 -0700)]
Null check intent before starting "learn more".

It is possible in certain build configurations to have an invalid
link. Instead of crashing, swallow the error and write to logs.

BUG: 28381984
Fixes: 31246856
Change-Id: I19f20b96afb42758187707f1b86a5817e8d737a8
(cherry picked from commit 6561d4870f031395316cf2fc956f69c306f04ae4)

7 years agoFix NullPointerException when refreshing wifi preferences.
Doris Ling [Wed, 31 Aug 2016 21:27:19 +0000 (14:27 -0700)]
Fix NullPointerException when refreshing wifi preferences.

AccessPointPreference.refresh() is being called in different threads.
The refresh of the preference should only be updated in the main thread.
When access point updates is received not in the main thread, will post
the refreshing of the preference to the message queue to make the update
on the UI thread.

Test: auto - run monkey to verify there is no ANR or crash
      manual - go to Settings->Wifi, toggle on/off many times and verify
      there is no crash.

Change-Id: I656a70ecf2e7b9446c7b95b6b42ab19a5cc2e51c
Fixes: 30902893

7 years agoRemove preference "Searching for Wi-Fi networks..."
Doris Ling [Tue, 30 Aug 2016 01:44:41 +0000 (18:44 -0700)]
Remove preference "Searching for Wi-Fi networks..."

When we add the preference "Searching for Wi-Fi networks...", we didn't
provide a key to the preference. As a result, each time when we get
access point update and try to show such tile, it creates a new one, and
results in multiple entries of such tile. Adding a key to the preference
will prevent the multiple entry from being added.

Test: Manual -
1. Turn wifi off and on several times, verify that there is only one entry
   of "Searching for Wi-Fi networks..." when initializing the wifi access
   point list.
2. Verifies that when the access point list is established, the
   "Searching for Wi-Fi networks..." entry is gone.

Change-Id: Iaad329d89f8e4b52129d0661501aa34fbd956692

Change-Id: I1bfa77051e068926e8c876a89adf14d143970e7e
Fixes: 31143961

7 years agoFix multiple bluetooth devices bug
Jason Monk [Mon, 25 Jul 2016 14:37:39 +0000 (10:37 -0400)]
Fix multiple bluetooth devices bug

Was bug in some code trying to handle preference animations better.
Since those animations are all disabled now, just remove everything
again and re-add it.

Change-Id: If1ce07a8f2b4144d95a95cec6ebb1b423644825a
Fixes: 29314480
(cherry picked from commit 6666f9cc37ac8f9b99c6a174b1478924ed8fc6cd)

7 years agoDon't remove wifi preferences when updating AP to avoid GC.
Fan Zhang [Wed, 24 Aug 2016 21:52:49 +0000 (14:52 -0700)]
Don't remove wifi preferences when updating AP to avoid GC.

Bug: 30870531

Removing wifi preferences every time will force update create a new set
of preferences, which leads to higher chance of GC.

Change-Id: Ifea2f63a3b54fa0d5861fb34a348d81e99bcab68

8 years agoMerge "Pre-setup restrictions" into nyc-dev
Jason Monk [Tue, 19 Jul 2016 20:31:15 +0000 (20:31 +0000)]
Merge "Pre-setup restrictions" into nyc-dev

8 years agoPre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481
Jason Monk [Fri, 15 Jul 2016 14:08:40 +0000 (14:08 +0000)]
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf am: 68d53c0481
am: e67f458667  -s ours

Change-Id: Ic5c066a81be1fe3b884cf1c9ead6c7c276a12fd1

8 years agoPre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf
Jason Monk [Fri, 15 Jul 2016 14:05:59 +0000 (14:05 +0000)]
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b am: 2d21d1b9cf
am: 68d53c0481

Change-Id: Ic501eb9b08f18eb3e9f3e95d64aae511815db268

8 years agoPre-setup restrictions DO NOT MERGE am: e6ad6e866b
Jason Monk [Fri, 15 Jul 2016 14:03:03 +0000 (14:03 +0000)]
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b
am: 2d21d1b9cf

Change-Id: I1fc62827de765434ac88a7cb75d63febb074b565

8 years agoPre-setup restrictions DO NOT MERGE
Jason Monk [Fri, 15 Jul 2016 13:59:59 +0000 (13:59 +0000)]
Pre-setup restrictions DO NOT MERGE
am: e6ad6e866b

Change-Id: I0bfc276c9bf0e3d6320cc9aa8c77f77899b69e04

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 11 Jul 2016 19:42:47 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 6 Jul 2016 02:42:12 +0000 (19:42 -0700)]
Import translations. DO NOT MERGE

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

8 years agoPre-setup restrictions
Jason Monk [Thu, 30 Jun 2016 15:26:08 +0000 (11:26 -0400)]
Pre-setup restrictions

 - Don't let user settings run

Bug: 29194585
Change-Id: Ia9c46c7ba04ce2809304bebe8a4c5cdac2108611

8 years agoPre-setup restrictions DO NOT MERGE
Jason Monk [Thu, 30 Jun 2016 15:26:08 +0000 (11:26 -0400)]
Pre-setup restrictions DO NOT MERGE

 - Prevent external tiles from system apps
 - Don't let user settings run
 - Disable help

Bug: 29194585
Change-Id: I74ab8aaab62d62cc4dbbdf3164429a503f3a572b

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Jun 2016 01:34:49 +0000 (18:34 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Fix DND conditional null state" into nyc-dev
Jason Monk [Mon, 27 Jun 2016 18:36:21 +0000 (18:36 +0000)]
Merge "Fix DND conditional null state" into nyc-dev

8 years agoFix DND conditional null state
Jason Monk [Mon, 27 Jun 2016 16:29:47 +0000 (12:29 -0400)]
Fix DND conditional null state

Persist all of the data it needs to produce the UI.

Change-Id: Ifb143b2cd3fef075cd77feaf53051eb8b7153a51
Fixes: 27664882

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 27 Jun 2016 14:34:32 +0000 (07:34 -0700)]
Import translations. DO NOT MERGE

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

8 years agoFix crash in AppDataUsage
Jason Monk [Fri, 24 Jun 2016 14:37:12 +0000 (10:37 -0400)]
Fix crash in AppDataUsage

Better handling of detecting apps

Change-Id: I15644c8d28f394aeac021af856d0d755d7a986c6
Fixes: 29609311

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 24 Jun 2016 06:22:56 +0000 (06:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 24 Jun 2016 05:02:51 +0000 (22:02 -0700)]
Import translations. DO NOT MERGE

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

8 years agoDon't toggle Data Saver again until it receives a callback.
Felipe Leme [Thu, 23 Jun 2016 22:18:11 +0000 (15:18 -0700)]
Don't toggle Data Saver again until it receives a callback.

BUG: 29253107
Change-Id: I4371f947086a45be6709d2a560d27d1f5f0e79c4

8 years agoMerge "Workaround to avoid crash in user photo selection" into nyc-dev
Jason Monk [Wed, 22 Jun 2016 19:45:07 +0000 (19:45 +0000)]
Merge "Workaround to avoid crash in user photo selection" into nyc-dev

8 years agoMerge "Protect against crash in font size" into nyc-dev
Jason Monk [Wed, 22 Jun 2016 19:04:16 +0000 (19:04 +0000)]
Merge "Protect against crash in font size" into nyc-dev

8 years agoWorkaround to avoid crash in user photo selection
Jason Monk [Wed, 22 Jun 2016 18:46:56 +0000 (14:46 -0400)]
Workaround to avoid crash in user photo selection

Bug: 29556966
Change-Id: I0715dee2a4cef2252b4ed1cc4d242b8b3d0ab45c

8 years agoProtect against crash in font size
Jason Monk [Wed, 22 Jun 2016 17:10:25 +0000 (13:10 -0400)]
Protect against crash in font size

Change-Id: Ib3578e0e82388a4f6aa3eeade0d990fc107b9c14
Fixes: 29438848

8 years agoMerge "Fix tethering re-enable after edit." into nyc-dev
Jason Monk [Wed, 22 Jun 2016 15:22:10 +0000 (15:22 +0000)]
Merge "Fix tethering re-enable after edit." into nyc-dev

8 years agoMerge "Update battery content descriptions with labels" into nyc-dev
Jason Monk [Wed, 22 Jun 2016 13:22:45 +0000 (13:22 +0000)]
Merge "Update battery content descriptions with labels" into nyc-dev

8 years agoMerge "Show "0" instead of "0 B" in storage settings." into nyc-dev
Daniel Sandler [Tue, 21 Jun 2016 18:11:11 +0000 (18:11 +0000)]
Merge "Show "0" instead of "0 B" in storage settings." into nyc-dev

8 years agoFix tethering re-enable after edit.
Jason Monk [Tue, 21 Jun 2016 18:04:39 +0000 (14:04 -0400)]
Fix tethering re-enable after edit.

Sometimes the tether state change comes in late (or seemingly not
at all).  Also listen for wifi ap state changes as a fallback for
this case.

Change-Id: I6677c4277453be881967a3cf2234de11cd0237b8
Fixes: 28851179

8 years agoUpdate battery content descriptions with labels
Jason Monk [Tue, 21 Jun 2016 17:36:57 +0000 (13:36 -0400)]
Update battery content descriptions with labels

Change-Id: I0ad4ca753f8f5e1a01e2e21181526ddb921d487a
Fixes: 28301362

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 16:53:25 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoFix non-app non-user preferences in Settings > Data usage
Zoltan Szatmary-Ban [Tue, 21 Jun 2016 11:57:30 +0000 (12:57 +0100)]
Fix non-app non-user preferences in Settings > Data usage

Bug:29466113
Change-Id: Ib7a6d477146a856c0cb9c49143ffbf4fb99e38ed

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 21 Jun 2016 11:28:46 +0000 (04:28 -0700)]
Import translations. DO NOT MERGE

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

8 years agoShow "0" instead of "0 B" in storage settings.
Dan Sandler [Tue, 21 Jun 2016 03:53:34 +0000 (23:53 -0400)]
Show "0" instead of "0 B" in storage settings.

Two benefits:
  - "0 B" might be a little confusing for sighted users
  - "zero bee" is definitely confusing for TalkBack users

Nonzero storage items will still read as "640 KB" which
should be enough for anyone.

Change-Id: I5c89f7c6382ca14fb91d7d1dd145977f855618ae
Fixes: 27973778

8 years agoMerge "Fix NPE printing notification actions." into nyc-dev
Julia Reynolds [Mon, 20 Jun 2016 18:43:04 +0000 (18:43 +0000)]
Merge "Fix NPE printing notification actions." into nyc-dev

8 years agoFix focusability of battery history chart
Jason Monk [Mon, 20 Jun 2016 15:04:43 +0000 (11:04 -0400)]
Fix focusability of battery history chart

Change-Id: I0bd0da84a08ed6e3c51da3dc6a68e878c5c0d3cd
Fixes: 29453492

8 years agoFix NPE printing notification actions.
Julia Reynolds [Mon, 20 Jun 2016 14:23:44 +0000 (10:23 -0400)]
Fix NPE printing notification actions.

Change-Id: Icb52e7bc632bf7109a75a7695fb253b2183e7360
Fixes: 29017025

8 years agoMerge "Protect against crash in memory details" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 17:22:03 +0000 (17:22 +0000)]
Merge "Protect against crash in memory details" into nyc-dev

8 years agoProtect against crash in memory details
Jason Monk [Fri, 17 Jun 2016 14:12:37 +0000 (10:12 -0400)]
Protect against crash in memory details

Change-Id: Ie80efa04d0c6bc9c117802e5a7018d448f4dc7b8
Fixes: 29308942

8 years agoMake sure screen pinning desc is part of view hierarchy
Jason Monk [Fri, 17 Jun 2016 14:05:06 +0000 (10:05 -0400)]
Make sure screen pinning desc is part of view hierarchy

Change-Id: I2c2e25e129d8530512e1a1f4ee6a7483b5322286
Fixes: 29243233

8 years agoMerge "Remove RemoteInput on lockscreen setting" into nyc-dev
Adrian Roos [Thu, 16 Jun 2016 23:33:55 +0000 (23:33 +0000)]
Merge "Remove RemoteInput on lockscreen setting" into nyc-dev

8 years agoMerge "Teach hard keyboard settings about correct user ID" into nyc-dev
Yohei Yukawa [Thu, 16 Jun 2016 21:24:04 +0000 (21:24 +0000)]
Merge "Teach hard keyboard settings about correct user ID" into nyc-dev

8 years agoRemove RemoteInput on lockscreen setting
Adrian Roos [Thu, 16 Jun 2016 20:28:44 +0000 (13:28 -0700)]
Remove RemoteInput on lockscreen setting

Bug: 29370898
Change-Id: I6fef3deb55357e8569e023968967663582974f79

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 16 Jun 2016 10:25:12 +0000 (10:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 16 Jun 2016 08:52:41 +0000 (01:52 -0700)]
Import translations. DO NOT MERGE

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

8 years agoTeach hard keyboard settings about correct user ID
Yohei Yukawa [Thu, 16 Jun 2016 07:02:01 +0000 (00:02 -0700)]
Teach hard keyboard settings about correct user ID

Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD is a per-user settings.
PhysicalKeyboardFragment needs to use the current user's ID rather than
hard-coded user ID 0.

Bug: 29406181
Change-Id: Ie40f729f3c85e9ce9ad8f957caba338786b119d9

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
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 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 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 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 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 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 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 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
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: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 [Mon, 13 Jun 2016 16:55:20 +0000 (12:55 -0400)]
DND header should be translated.

Change-Id: Iac764d71e91f5a0dc1b58bfca8a38d823f0598b9
Fixes: 29123731

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: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 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 [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 "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: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: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
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 05:38:29 +0000 (22:38 -0700)]
Import translations. DO NOT MERGE

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

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 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 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
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-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 01:48:05 +0000 (18:48 -0700)]
Import translations. DO NOT MERGE

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

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

8 years agoFix data usage format strings
Jason Monk [Mon, 6 Jun 2016 20:39:55 +0000 (16:39 -0400)]
Fix data usage format strings

Bug: 28747101
Change-Id: I5be9bb7ce3b11709117da698d6c03610f4e5e40e