OSDN Git Service
Bill Yi [Fri, 3 Jun 2016 22:21:49 +0000 (22:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
edafefc1ed -s ours
* commit '
edafefc1edb806b0a4f350b656c4f08f5c3d90e7':
Import translations. DO NOT MERGE
Change-Id: I61695109d9a89b5e4ab572afc17d773daee9f6d4
Jason Monk [Fri, 3 Jun 2016 22:21:47 +0000 (22:21 +0000)]
Merge "Fix accidental non-translatable string" into nyc-dev
am:
8c5dccc6bf
* commit '
8c5dccc6bf05397cf4c51ce88d561fecbebba059':
Fix accidental non-translatable string
Change-Id: I71c42ccd2daca0801263809edb36eb4d175d444a
TreeHugger Robot [Fri, 3 Jun 2016 19:22:55 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 19:18:29 +0000 (19:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Jason Monk [Fri, 3 Jun 2016 19:12:09 +0000 (19:12 +0000)]
Merge "Fix accidental non-translatable string" into nyc-dev
Jason Monk [Fri, 3 Jun 2016 19:06:56 +0000 (15:06 -0400)]
Fix accidental non-translatable string
Bug:
29034697
Change-Id: If45ef25db1d23fd2ce83ca3119fa63c0ebbcdead
Bill Yi [Fri, 3 Jun 2016 17:43:44 +0000 (10:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief4e4adccef8f8a438e629d07e3129f3441293b6
Auto-generated-cl: translation import
Sudheer Shanka [Fri, 3 Jun 2016 17:14:43 +0000 (17:14 +0000)]
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev
am:
a433fd2429
* commit '
a433fd2429dfc37ab60b4dc7a17cb2e714ef6fbd':
Avoid triggering device admin settings in non-current user.
Change-Id: I0557ea43f891a272f946987197bbb7df0aef9b0e
Bill Yi [Fri, 3 Jun 2016 17:09:43 +0000 (10:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iafa80717a736b94e0ef1ccd8eaa42b61379349e2
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 3 Jun 2016 17:02:51 +0000 (17:02 +0000)]
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev
Makoto Onuki [Fri, 3 Jun 2016 15:33:52 +0000 (15:33 +0000)]
Fix RTL layout
am:
3a87050921
* commit '
3a87050921f78e0882893bc343e49b8bb1b34975':
Fix RTL layout
Change-Id: Ia43ea6cb762de491564ed442d3751c2887d85735
Makoto Onuki [Fri, 3 Jun 2016 00:47:56 +0000 (17:47 -0700)]
Fix RTL layout
Bug
29072224
Change-Id: I414d868b4256e034850a873511bf34d9430842dc
Fyodor Kupolov [Thu, 2 Jun 2016 22:49:07 +0000 (22:49 +0000)]
Merge "Make prefs without an action unselectable" into nyc-dev
am:
9121169dca
* commit '
9121169dca4bf3f11908031fd72448025d3933d4':
Make prefs without an action unselectable
Change-Id: Ia3b0efe9acd7c4ebf9213d141211f23322b8152e
Fyodor Kupolov [Thu, 2 Jun 2016 22:30:22 +0000 (22:30 +0000)]
Merge "Make prefs without an action unselectable" into nyc-dev
Sudheer Shanka [Thu, 2 Jun 2016 19:40:22 +0000 (12:40 -0700)]
Avoid triggering device admin settings in non-current user.
Bug:
28953755
Change-Id: Ic9f6f57b1ef4cc1de2d1ea227b17faf4334ffec8
Fyodor Kupolov [Thu, 2 Jun 2016 17:39:33 +0000 (10:39 -0700)]
Make prefs without an action unselectable
Setting selectable=false is required for proper A11y. Otherwise Talkback
will inform the user that the item can be activated.
Bug:
29025567
Change-Id: I2b61c622c2d69fa83640f7822349613f51f849d5
Wei Wang [Thu, 2 Jun 2016 17:22:59 +0000 (17:22 +0000)]
Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev
am:
d0d3ca3b7c
* commit '
d0d3ca3b7c64dc30c5262251b5a6f610e2127a69':
Revert "Add an entry in developer options for location tools."
Change-Id: I66441bf21ddd8f0977bcaec7d92a28406e3bcf0e
Wei Wang [Thu, 2 Jun 2016 17:14:02 +0000 (17:14 +0000)]
Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev
Wei Wang [Thu, 2 Jun 2016 04:42:02 +0000 (04:42 +0000)]
Revert "Add an entry in developer options for location tools."
Bug:
28251942
This reverts commit
e1c1a13cba6d1d8d3ffe9f2031f6234dc4bc467d.
Change-Id: I864a813e8f6a9488b4db2f876a0097e947ceae45
Jason Monk [Wed, 1 Jun 2016 20:20:01 +0000 (16:20 -0400)]
resolve merge conflicts of
67e87fa to nyc-mr1-dev
Change-Id: I8c5a79de3176912a1803a481b8b179faf1dad178
Jason Monk [Wed, 1 Jun 2016 20:09:00 +0000 (20:09 +0000)]
Merge "onResume -> onStart, onPause -> onStop" into nyc-dev
Sudheer Shanka [Wed, 1 Jun 2016 18:39:24 +0000 (18:39 +0000)]
Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev
am:
df66d4abf0
* commit '
df66d4abf0c994b5f53ec0978ba97e746852e3e9':
Start DeviceAdminSettings in a new task from support dialog.
Change-Id: I6a249b3e238f0ab8336e1a6d81bf77d7b2d3a11d
TreeHugger Robot [Wed, 1 Jun 2016 18:16:21 +0000 (18:16 +0000)]
Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:45:25 +0000 (13:45 -0400)]
onResume -> onStart, onPause -> onStop
For SettingsActivity and DashboardSummary
Bug:
28896214
Change-Id: I235d5c82b04b1363bf4416acb5cf5fc1c4db704f
Jason Monk [Wed, 1 Jun 2016 17:39:13 +0000 (17:39 +0000)]
Merge "Fix some top-level settings not updating with language" into nyc-dev
am:
ed70356506
* commit '
ed703565063107350970959d82ac63eb76b51d26':
Fix some top-level settings not updating with language
Change-Id: I4f2f0295a73e115fdcc8eb76cc40854cc98e493c
Jason Monk [Wed, 1 Jun 2016 17:30:19 +0000 (17:30 +0000)]
Merge "Cache account prefs so we don\'t lose a11y focus" into nyc-dev
am:
9791704411
* commit '
979170441191f4c0fa292def1f2124bd62f70ffb':
Cache account prefs so we don't lose a11y focus
Change-Id: I475b564279160e4100008fb6affb48d1659de05f
Jason Monk [Wed, 1 Jun 2016 17:30:13 +0000 (17:30 +0000)]
Merge "Fix apps spinner jank." into nyc-dev
am:
ad302548ea
* commit '
ad302548ea5a030c2e44eb22a212285493037729':
Fix apps spinner jank.
Change-Id: I1867f2166dea86a9debd6f4304d6e43a8cbe32aa
Jason Monk [Wed, 1 Jun 2016 17:27:49 +0000 (17:27 +0000)]
Merge "Fix some top-level settings not updating with language" into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:19:56 +0000 (17:19 +0000)]
Merge "Cache account prefs so we don't lose a11y focus" into nyc-dev
Jason Monk [Tue, 31 May 2016 20:18:17 +0000 (16:18 -0400)]
Cache account prefs so we don't lose a11y focus
Fixes:
28767151
Change-Id: I876712c42b02bb2efaaa492ad951ad42935ecb32
Jason Monk [Wed, 1 Jun 2016 17:03:54 +0000 (17:03 +0000)]
Merge "Fix apps spinner jank." into nyc-dev
Jason Monk [Wed, 1 Jun 2016 16:44:44 +0000 (12:44 -0400)]
Fix apps spinner jank.
Change-Id: I7fbe580627538037fd0f1823787f7dcebbb43252
Fixes:
29056706
Sudheer Shanka [Tue, 31 May 2016 18:50:18 +0000 (11:50 -0700)]
Start DeviceAdminSettings in a new task from support dialog.
Bug:
28998790
Change-Id: Ia43d6e719124e0908ec8ccb8c1ba7e80b5297096
Bill Yi [Wed, 1 Jun 2016 15:22:23 +0000 (15:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
fb9e8e3188 -s ours
* commit '
fb9e8e31884e26f09ac35ec81ab5fc8c518a0945':
Import translations. DO NOT MERGE
Change-Id: Ife2d19d87b06863ed5743a516959a5c3d84e56b2
TreeHugger Robot [Wed, 1 Jun 2016 15:14:12 +0000 (15:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:12:42 +0000 (15:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Robin Lee [Wed, 1 Jun 2016 14:22:07 +0000 (14:22 +0000)]
Disable restricted VPN actions onResume
am:
52541536d0
* commit '
52541536d0d4c8f78be26f94fa8f0cf297bde1c4':
Disable restricted VPN actions onResume
Change-Id: I24772b0a6bc5b34bb5dc98508d26ab98d43bc670
Bill Yi [Wed, 1 Jun 2016 13:40:08 +0000 (06:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6e36edcd4fa922050390eb4f0e934b910b0a33c6
Auto-generated-cl: translation import
Bill Yi [Wed, 1 Jun 2016 13:23:22 +0000 (06:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I19e1428a2e4ec2971c4aa611345a3372cc7ef4e3
Auto-generated-cl: translation import
Robin Lee [Fri, 20 May 2016 14:44:08 +0000 (15:44 +0100)]
Disable restricted VPN actions onResume
Otherwise it's pretty easy to circumvent any future restrictions by
keeping VPN settings for a particular app open and continuing to use
it even after DISALLOW_CONFIG_VPN is applied.
Two checks:
1) in onResume (catches almost every case)
2) in setAlwaysOn (catches every remaining case)
Bug:
28733079
Change-Id: I1c67bb14891ef620df5ed65fbd32678e417b4a65
Victor Chang [Wed, 1 Jun 2016 10:13:52 +0000 (10:13 +0000)]
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev
am:
36522e8854
* commit '
36522e885479b30bc49a8a7333f436d5744431bc':
Show different strings when PO/DO user approves a cert
Change-Id: I1cf166e58afd13c0927eb4460a7d88a22ba9dfe7
Victor Chang [Wed, 1 Jun 2016 10:07:16 +0000 (10:07 +0000)]
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev
Tony Mak [Wed, 1 Jun 2016 09:44:06 +0000 (09:44 +0000)]
Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev
am:
ffb10f8156
* commit '
ffb10f8156b42261340362ee440002dd7f0a5c5b':
Fix RTL issue in Trusted Credentail page
Change-Id: Ib91896687a2c5297ae9f1454b0b7729e2dd670a7
Tony Mak [Wed, 1 Jun 2016 09:36:51 +0000 (09:36 +0000)]
Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev
Meng Wang [Thu, 26 May 2016 00:12:27 +0000 (17:12 -0700)]
Launch E911 address management activity at turning on Wifi Calling
Bug:
28404126
Change-Id: Id551d784d151e5f24cfcec96e6cf4b999f39ce0f
Victor Chang [Tue, 31 May 2016 21:07:20 +0000 (22:07 +0100)]
Show different strings when PO/DO user approves a cert
1. This is confusing for restricted users who don't have any options other
than 'Trust'.
2. show dialog title of "Check certificate" instead of "Trust or remove certificate"
The change only applies to ProfileOwner and DeviceOwner case
Fix:
28875819
Change-Id: I3f7dc8f3dcac75b4d99814cbc9af67433676a8c7
Tony Mak [Tue, 31 May 2016 19:51:01 +0000 (20:51 +0100)]
Fix RTL issue in Trusted Credentail page
Two changes are required to fix the issue.
1. The width of the textview needed to be wrap_content in order
to resolve the random issue. I guess it is a framework bug, but
anyway the UI looks the same after the change
2. textAlignment="viewStart" is needed to make the textview RTL
3. Clean up: Change the RelativeLayout to a vertical LinearLayout
Bug:
28757193
Change-Id: I1142d4dd31eb86b80f5a2316c1c7825df287b609
Jason Monk [Tue, 31 May 2016 18:49:03 +0000 (14:49 -0400)]
Fix some top-level settings not updating with language
They need to be resources so they can load correctly on locale
change.
Change-Id: Iea167b8df411528185987d37704717d9c0b9f254
Fixes:
28861758
Andrew Sapperstein [Tue, 31 May 2016 18:38:07 +0000 (18:38 +0000)]
Merge "Remove the last vestiges of #
ff009587." into nyc-mr1-dev
Daniel Nishi [Tue, 31 May 2016 18:25:18 +0000 (18:25 +0000)]
Merge "Add an automatic storage management job service." into nyc-mr1-dev
Daniel Nishi [Wed, 4 May 2016 17:08:36 +0000 (10:08 -0700)]
Add an automatic storage management job service.
This service runs once a day when plugged in when the device has
under 15% free space remaining. If the FeatureFactory has a
storage management job, it runs the job to begin to free up space
on the device.
This is a temporary landing place and will be refactored very
quickly out of Settings.
Bug:
28600825
Change-Id: Id2ebb42a333b3b4e3daef4e50cf985fe055b85c7
Anna Galusza [Tue, 31 May 2016 16:39:46 +0000 (16:39 +0000)]
Merge "Change Nav bar style to use system nav (new style for Nexus N+) Bug:
27612740" into nyc-mr1-dev
Bill Yi [Tue, 31 May 2016 16:36:46 +0000 (16:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
aa56eef3fd -s ours
* commit '
aa56eef3fd67e8eb20df96850e0175fb15b3f415':
Import translations. DO NOT MERGE
Change-Id: I8d141f7bb06750c09b60084105ec51f6aeb244ad
TreeHugger Robot [Tue, 31 May 2016 16:22:39 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 31 May 2016 03:54:15 +0000 (03:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Roozbeh Pournader [Tue, 31 May 2016 02:07:35 +0000 (02:07 +0000)]
Merge "Merge "Show only up to two locales in Settings" into nyc-dev am:
a260cf8931" into nyc-mr1-dev
Roozbeh Pournader [Tue, 31 May 2016 01:20:52 +0000 (01:20 +0000)]
Merge "Show only up to two locales in Settings" into nyc-dev
am:
a260cf8931
* commit '
a260cf8931bb51e2a8879deb8461c9444595b786':
Show only up to two locales in Settings
Change-Id: I8da73979371f5342fc1cd636e0483b7507a06697
Roozbeh Pournader [Tue, 31 May 2016 01:14:39 +0000 (01:14 +0000)]
Merge "Show only up to two locales in Settings" into nyc-dev
am:
a260cf8931
* commit '
a260cf8931bb51e2a8879deb8461c9444595b786':
Show only up to two locales in Settings
Change-Id: I4e9d948e1d5d7e0c96116d2d850adf143b300b1c
Roozbeh Pournader [Tue, 31 May 2016 01:02:41 +0000 (01:02 +0000)]
Merge "Show only up to two locales in Settings" into nyc-dev
Bill Yi [Mon, 30 May 2016 19:22:06 +0000 (12:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3605c1798d792b668db15397c857113d8f7f660c
Auto-generated-cl: translation import
Bill Yi [Mon, 30 May 2016 19:06:25 +0000 (12:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: If3ccb0d85f8c6ab4d8c4968445989fd0083fcbe9
Auto-generated-cl: translation import
Anna Galusza [Thu, 31 Mar 2016 00:25:36 +0000 (17:25 -0700)]
Change Nav bar style to use system nav (new style for Nexus N+)
Bug:
27612740
Change-Id: I309cf8252285130a0e1d2c03ca664706e73cce16
Jason Monk [Fri, 27 May 2016 17:09:56 +0000 (17:09 +0000)]
Merge "Fix pref availability for search" into nyc-dev
am:
8eaa3de931
* commit '
8eaa3de9317eb21855db43ed276b90ca48ad1d28':
Fix pref availability for search
Change-Id: I777450a2531d9c817d6ff76068b6ac7c02fcb782
Jason Monk [Fri, 27 May 2016 17:09:55 +0000 (17:09 +0000)]
Merge "Don\'t allow restricted data usage of system" into nyc-dev
am:
da52f08b0a
* commit '
da52f08b0a86182cef1f0949f0ef45d5efa092cc':
Don't allow restricted data usage of system
Change-Id: Ic6bba24f75979f9c9ac1fdcf8127f89770bf1f57
Jason Monk [Fri, 27 May 2016 17:07:23 +0000 (17:07 +0000)]
Merge "Fix pref availability for search" into nyc-dev
Jason Monk [Fri, 27 May 2016 16:58:53 +0000 (12:58 -0400)]
Fix pref availability for search
Change-Id: Ic080e131c6c751456b22d370aade77748d912b6b
Fixes:
28987828
Jason Monk [Fri, 27 May 2016 16:51:59 +0000 (16:51 +0000)]
Merge "Don't allow restricted data usage of system" into nyc-dev
Jason Monk [Fri, 27 May 2016 14:57:10 +0000 (10:57 -0400)]
Don't allow restricted data usage of system
Cause it will just crash
Change-Id: I4ee43633eb3fa488816b1d2767073cbe404c2c33
Fixes:
28979013
Julia Reynolds [Thu, 26 May 2016 15:08:16 +0000 (11:08 -0400)]
Importance slider updates.
Icon & tint.
Bug:
28911161
Change-Id: Ic56270c8803557863f914ee0eaf6801f1341387d
Bart Sears [Fri, 27 May 2016 01:58:26 +0000 (01:58 +0000)]
Revert "Importance slider updates."
This reverts commit
373a9e2fcfedda0dbf736d2e3f95edaf38833756.
Change-Id: I3279163eb052f93cf6b87710c17cfa0c2eae56ba
Roozbeh Pournader [Fri, 27 May 2016 04:05:46 +0000 (04:05 +0000)]
Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev
am:
24aa3b01af
* commit '
24aa3b01af017c0d020a4e31ff88203f20140ce3':
Force dashboard summary to single-line and ellipsize it
Change-Id: I16fb9f03066017c946fa787ca5b0214e1b9f64de
Maurice Lam [Fri, 27 May 2016 04:05:45 +0000 (04:05 +0000)]
Merge "Add activity label to encryption interstitial" into nyc-dev
am:
19c0046422
* commit '
19c0046422e0cf5586e37323157a27331db45572':
Add activity label to encryption interstitial
Change-Id: I9bcda822435a42c9bf7d5486b7497fb6a8f30cf4
Bill Yi [Fri, 27 May 2016 04:05:43 +0000 (04:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
d5f7c20a26 -s ours
* commit '
d5f7c20a268b7c0ebe52bc10f6887b8ad91830f5':
Import translations. DO NOT MERGE
Change-Id: I9387ffb81450e3a57e725a9994c915037eabc49c
Julia Reynolds [Fri, 27 May 2016 04:04:31 +0000 (04:04 +0000)]
Merge "Importance slider updates." into nyc-dev
am:
7c2c025e4f
* commit '
7c2c025e4ff6b91ab3ab1e78e278a12a8051c542':
Importance slider updates.
Change-Id: Ieb897d94383c401154fde35dc9bf94ca57ce1ca6
Roozbeh Pournader [Fri, 27 May 2016 02:01:06 +0000 (19:01 -0700)]
Show only up to two locales in Settings
The list could otherwise grow very long, spamming the screen.
Bug:
28872122
Change-Id: I8c4dbe659e1c088eba8b5ba1b2905b5eb8bc0229
Andrew Sapperstein [Fri, 27 May 2016 00:18:38 +0000 (17:18 -0700)]
Remove the last vestiges of #
ff009587.
It was very close the proper colorAccent, so just use that everywhere.
This change updates the Memory Settings page and the running processes
page.
BUG:
28987891
Change-Id: I3895ae9b596125d7e4bda0d02f0686c87a75ead6
Roozbeh Pournader [Fri, 27 May 2016 00:11:47 +0000 (00:11 +0000)]
Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev
Roozbeh Pournader [Wed, 25 May 2016 21:33:20 +0000 (14:33 -0700)]
Force dashboard summary to single-line and ellipsize it
Previously, the summary could become multiline. In rare combinations
of text and screen width, to indicate to the user that the text is
cut, we now ellipsize it too. Finally, since the ellipsis can get
too close to the end of the line, we add a padding equal to the left
margin of the icon.
Bug:
28872122
Change-Id: I27226e5de7781cf096508ddbef4f9095961ce028
Maurice Lam [Thu, 26 May 2016 23:46:06 +0000 (23:46 +0000)]
Merge "Add activity label to encryption interstitial" into nyc-dev
Daniel Nishi [Thu, 26 May 2016 20:28:14 +0000 (20:28 +0000)]
Merge "Hide the Deletion Helper entry points from Settings." into nyc-mr1-dev
Maurice Lam [Thu, 26 May 2016 18:54:02 +0000 (18:54 +0000)]
Merge "Make fingerprint inherit from GLIF theme" into nyc-mr1-dev
Daniel Nishi [Thu, 26 May 2016 18:12:56 +0000 (11:12 -0700)]
Hide the Deletion Helper entry points from Settings.
Remove the menu item which enters the Deletion Helper fragment.
The deletion helper can still be accessed if storage management is
enabled in the storage management settings.
Bug:
28967987
Change-Id: Iff4730998edbab5889b2b8e23b6ad260ae0c0359
Jason Monk [Thu, 26 May 2016 17:53:41 +0000 (17:53 +0000)]
Merge "Fix crash from battery saver switch" into nyc-dev
am:
371aec1e92
* commit '
371aec1e92aa4b5cf6e4ed2b5f39faf180c17d1f':
Fix crash from battery saver switch
Change-Id: I0416b92dbc9b18a97c9d6d0617cba636e310690b
TreeHugger Robot [Thu, 26 May 2016 17:07:20 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 17:06:33 +0000 (17:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Julia Reynolds [Thu, 26 May 2016 16:50:56 +0000 (16:50 +0000)]
Merge "Importance slider updates." into nyc-dev
Jason Monk [Thu, 26 May 2016 16:46:51 +0000 (16:46 +0000)]
Merge "Fix crash from battery saver switch" into nyc-dev
Julia Reynolds [Thu, 26 May 2016 15:08:16 +0000 (11:08 -0400)]
Importance slider updates.
Icon & tint.
Bug:
28911161
Change-Id: Ic56270c8803557863f914ee0eaf6801f1341387d
Jason Monk [Thu, 26 May 2016 15:07:53 +0000 (11:07 -0400)]
Fix crash from battery saver switch
Turns out most things expect the conditions to be loaded immediately
so if the dashboard hasn't been hit, they crash. Instead load
immediately for everything but the dashboard.
Change-Id: Iaa1114c88b3766e2ac513acb417ef2a55a0f4e7f
Fixes:
28952354
Ricky Wai [Thu, 26 May 2016 14:04:21 +0000 (14:04 +0000)]
Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev
am:
fec38d0699
* commit '
fec38d06991b0c49750d02e27e6d8a452a1bca29':
Use LockPatternUtils.resetKeyStore() to clear keystore
Change-Id: I1231288f2e7c5166885992b103e720f467358858
Ricky Wai [Thu, 26 May 2016 13:46:25 +0000 (13:46 +0000)]
Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev
Victor Chang [Thu, 26 May 2016 11:13:40 +0000 (11:13 +0000)]
Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev
am:
eb02435cbf
* commit '
eb02435cbf06335dc641a20a9c244323f7567710':
Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation
Change-Id: I179673366395df90dcef132d17599282ee4d191c
Victor Chang [Thu, 26 May 2016 10:55:26 +0000 (10:55 +0000)]
Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev
Maurice Lam [Wed, 25 May 2016 23:34:09 +0000 (16:34 -0700)]
Make fingerprint inherit from GLIF theme
Set SuwThemeGlif.Light as the parent of fingerprint theme so that it
will inherit the margins and any other attributes.
There should be no visual change other than the fixed margins.
Bug:
28965312
Change-Id: I4e51c501c8ddb0e412e194e47bcee728da151ec5
Maurice Lam [Wed, 25 May 2016 23:56:36 +0000 (23:56 +0000)]
Merge "Update button styles in fingerprint setup" into nyc-mr1-dev
Derek Tan [Wed, 25 May 2016 23:51:49 +0000 (23:51 +0000)]
Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev
am:
08e24d43b6
* commit '
08e24d43b6f1021b4eb6cd71543f16226d43bded':
Use getConfigForSubId instead of getConfig(int).
Change-Id: Ib804dcf00e5e183d3d9c02bc14513c98a7852ace
Derek Tan [Wed, 25 May 2016 23:41:19 +0000 (23:41 +0000)]
Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev
Bill Yi [Wed, 25 May 2016 23:21:16 +0000 (16:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I587fce9e3728b76d7167c2049ecdd4c412e1d6e8
Auto-generated-cl: translation import
Sudheer Shanka [Wed, 25 May 2016 23:10:43 +0000 (23:10 +0000)]
Merge "Guard against IllegalArgumentException" into nyc-dev
am:
96305a2b34
* commit '
96305a2b34b9b22d815200372c7636d28175b8fd':
Guard against IllegalArgumentException
Change-Id: I03ad7e1ed4fe1c2ebd65ab822364566eba1d5b34
Bill Yi [Wed, 25 May 2016 23:07:25 +0000 (16:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I62ad1f9b258253eda03814f9a7bd93986c85f902
Auto-generated-cl: translation import
OSDN Git Service
