OSDN Git Service
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 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 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
TreeHugger Robot [Wed, 25 May 2016 23:07:00 +0000 (23:07 +0000)]
Merge "Guard against IllegalArgumentException" into nyc-dev
Sunny Goyal [Wed, 25 May 2016 22:50:43 +0000 (22:50 +0000)]
Merge "Add an option allowing to skip wallpaper apps selection." into nyc-mr1-dev
Maurice Lam [Wed, 25 May 2016 22:25:13 +0000 (15:25 -0700)]
Update button styles in fingerprint setup
Bug:
28888250
Change-Id: I2f9e7b4c886f27deac6b42860452a3fa0006facd
Derek Tan [Wed, 25 May 2016 22:00:27 +0000 (15:00 -0700)]
Use getConfigForSubId instead of getConfig(int).
Per API review, we want to revert getConfig(int) to
getConfigForSubId(int) (ag/
1075011). This CL changes all
callers to use getConfigForSubId(int).
Bug:
28295813
Change-Id: I0e44a5e758aed34ce26740632270700bde66cff6
Robin Lee [Wed, 25 May 2016 21:19:23 +0000 (21:19 +0000)]
Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev
am:
a6269236a2
* commit '
a6269236a24e00947efd3471f2901783413d56e5':
Don't crash trying to disable lockdown VPN
Change-Id: I71ecde2a45a26c775f5738c232b7d0da834af42a
Robin Lee [Wed, 25 May 2016 21:05:53 +0000 (21:05 +0000)]
Merge "Don't crash trying to disable lockdown VPN" into nyc-dev
Sudheer Shanka [Wed, 25 May 2016 20:17:12 +0000 (13:17 -0700)]
Guard against IllegalArgumentException
Bug:
28742227
Change-Id: If436ec3f743ca11ea40dce2033b7b993cb6ad170
Daniel Nishi [Wed, 25 May 2016 20:02:25 +0000 (20:02 +0000)]
Merge "Update the summary strings in the Deletion Helper to match the latest mocks." into nyc-mr1-dev
Daniel Nishi [Wed, 25 May 2016 19:55:57 +0000 (19:55 +0000)]
Merge "Hook up the automatic storage manager settings with the flag." into nyc-mr1-dev
Sunny Goyal [Wed, 25 May 2016 19:41:16 +0000 (12:41 -0700)]
Add an option allowing to skip wallpaper apps selection.
This commit adds an option to the Settings application, making it
possible to launch a different activity for wallpaper selection
Also removing te intent constant android.settings.WALLPAPER_SETTINGS
The target for this action can't be easily overriden when the
wallpaper target is overriden, which would provide an inconsistant
experience.
Bug:
28554244
Bug:
26688904
Change-Id: I25367fbb4505615351fbad9e1aa1ca88df0cd034
Andrew Sapperstein [Wed, 25 May 2016 19:40:50 +0000 (19:40 +0000)]
Merge "More theming fixes." into nyc-mr1-dev
Jeff Sharkey [Wed, 25 May 2016 18:30:30 +0000 (18:30 +0000)]
Merge "Skip indexing content while user is locked." into nyc-dev
am:
c416433a9e
* commit '
c416433a9ee55e2ac44fdb8e6c6d6ca4ed4cde62':
Skip indexing content while user is locked.
Change-Id: I749bebca289615b2a68fb87e463cadee4fb8840e
Jason Monk [Wed, 25 May 2016 18:28:02 +0000 (18:28 +0000)]
Don\'t update conditions on background threads
am:
6cb280d146
* commit '
6cb280d14641327b32378504544d125bbc3bcaf3':
Don't update conditions on background threads
Change-Id: I446e85dc5462e3c06a75e2e53f1990990bb06f48
TreeHugger Robot [Wed, 25 May 2016 18:27:29 +0000 (18:27 +0000)]
Merge "Skip indexing content while user is locked." into nyc-dev
Daniel Nishi [Tue, 24 May 2016 01:11:49 +0000 (18:11 -0700)]
Update the summary strings in the Deletion Helper to match the latest mocks.
Bug:
28917902
Change-Id: I35af7483f2a97dffc230093a90f0b7d87a4532c1
Andrew Sapperstein [Wed, 25 May 2016 01:07:48 +0000 (18:07 -0700)]
More theming fixes.
Updated the importance seekbar to use colorAccent instead of a hardcoded
color.
Refactored the various gear icons to all use ic_settings (a rename of
ic_bt_config). Deleted the png version (ic_sysbar_quicksettings).
Cleaned up the add icon. Now there are two vector drawables (one white,
one tinted with the accent color). Deleted the existing pngs and updated
the usages to use one of the two vector drawables. Deleted the theme
attr for ic_menu_add that had no usages.
BUG:
28760785
Change-Id: Icd5561d5b3f5ddee8aab78a3da7daa2dca0e30e3
Andrew Sapperstein [Wed, 25 May 2016 17:16:09 +0000 (17:16 +0000)]
Merge "Fix confirm lock UI theme." into nyc-mr1-dev
Daniel Nishi [Mon, 23 May 2016 21:20:36 +0000 (14:20 -0700)]
Hook up the automatic storage manager settings with the flag.
This allows the settings menu to actually toggle the feature on
and off.
Bug:
28905328
Change-Id: I132c0930970b70a0f88b8fc21e85b6829aaef8c8
Jason Monk [Wed, 25 May 2016 16:53:34 +0000 (12:53 -0400)]
Don't update conditions on background threads
Instead build a list and set it on the main thread to avoid
concurrent modification crashes.
Change-Id: I936fbeb70359583e55ae8ddcb0ea46b5753cb3b0
Fixes:
28794277
Jeff Sharkey [Wed, 25 May 2016 16:52:33 +0000 (10:52 -0600)]
Skip indexing content while user is locked.
Otherwise we try touching printing services which throw.
Bug:
28912897
Change-Id: I25638794b35fd383fbe67604ac921d16743628ad
Ricky Wai [Wed, 25 May 2016 13:18:43 +0000 (13:18 +0000)]
Hide work profile key in user credentials screen
am:
9579274cda
* commit '
9579274cda38c552b43febe0980f0ec6bd07277d':
Hide work profile key in user credentials screen
Change-Id: I1b0b50a5ff0cc8dd0bef132ac63790c677bba188
Ricky Wai [Tue, 24 May 2016 18:28:53 +0000 (19:28 +0100)]
Hide work profile key in user credentials screen
Bug:
28878708
Change-Id: Ic9733ea973e1cc37028cb5f740969b5e24fb5aef
Maurice Lam [Wed, 25 May 2016 03:03:08 +0000 (20:03 -0700)]
Add activity label to encryption interstitial
So that TalkBack refers to the screen by this more specific name.
Bug:
28868846
Change-Id: I93139959dcdbd156d57f01699283e01b178305b8
Andrew Sapperstein [Mon, 23 May 2016 23:38:28 +0000 (16:38 -0700)]
Fix confirm lock UI theme.
Now uses colorPrimary as its background color and sets colorAccent
directly. Some other mild cleanup as well.
BUG:
28760785
Change-Id: Ib8e5140b789449e518b498bc49438cb4a2bc6451
Andrew Sapperstein [Sat, 21 May 2016 01:38:01 +0000 (18:38 -0700)]
Update color bar defaults to use theme attr colors
Previously the values were hardcoded. Now the default value
for left and middle are colorAccent. Also updated SummaryPreference
to not call LinearColorBar.setColors unless its own setColors is called.
BUG:
28760785
Change-Id: Id28e809e6b5f0f6508258c995d5dcfacbc9c8725
Andrew Sapperstein [Fri, 20 May 2016 23:50:35 +0000 (16:50 -0700)]
Update Theme.DialogWhenLarge to use theme colors.
This theme is at least used by the Phone Status activity and probably
others as well.
BUG:
28760785
Change-Id: If3faa84ad9d291f007c7191f1c0dba8d98fe9bf8
Andrew Sapperstein [Thu, 19 May 2016 20:48:53 +0000 (13:48 -0700)]
Update alertDialogTheme to use proper colorAccent.
The settings dialogs were all using the default colorAccent.
Now it uses the app's version.
BUG:
28760785
Change-Id: Ic9bf90745db7d2ef5b1fd047474bab5c6bbdab23
Adrian Roos [Wed, 25 May 2016 00:23:28 +0000 (00:23 +0000)]
Merge "Remove option to configure emergency app" into nyc-dev
am:
06b7d7cdf9
* commit '
06b7d7cdf954902dad8fde766fe54ea315a463b3':
Remove option to configure emergency app
Change-Id: Ia306455b8fe44d6e42493937fce6ad92904737fe
TreeHugger Robot [Wed, 25 May 2016 00:17:20 +0000 (00:17 +0000)]
Merge "Remove option to configure emergency app" into nyc-dev
TreeHugger Robot [Tue, 24 May 2016 23:50:29 +0000 (23:50 +0000)]
Merge "Replace bluetooth pngs with vector drawables." into nyc-mr1-dev
Andrew Sapperstein [Thu, 19 May 2016 01:03:25 +0000 (18:03 -0700)]
Replace bluetooth pngs with vector drawables.
The current pngs are hardcoded to the green accent color.
Instead, the new vector drawable replacements have colorAccent
set as a tint.
BUG:
28760785
Change-Id: I01853d4e93bca6651460ad86505d0943dc68bf93
Daniel Nishi [Fri, 20 May 2016 18:07:12 +0000 (11:07 -0700)]
Change Downloads to show individual files in the Deletion Helper.
The first implementation simply had every file in the Downloads folder
be under a single checkbox. This iteration makes Downloads an
expandable dropdown preference listing every single file individually
for selection to be deleted.
Bug:
28621781
Change-Id: I5169caf718cee4c0fa7f0248bc4c443984766005
Daniel Nishi [Tue, 24 May 2016 21:18:39 +0000 (21:18 +0000)]
Merge "Update the storage manager settings to match the mocks." into nyc-mr1-dev
TreeHugger Robot [Tue, 24 May 2016 21:13:23 +0000 (21:13 +0000)]
Merge "Refactor Settings theme colors." into nyc-mr1-dev
Andrew Sapperstein [Tue, 17 May 2016 00:27:12 +0000 (17:27 -0700)]
Refactor Settings theme colors.
Introduces stock colors (primary_color, primary_dark_color, etc) to allow
overriding the colors via resource overlays.
Creates new colorSecondary attribute and updates switches to use theme
attributes for foreground/background colors rather than hardcoded values.
Some other mild color cleanup to make things more straightforward.
BUG:
28760785
Change-Id: I4deba962357217bdb2e08c08e8f83b9b57a683d4
Daniel Nishi [Tue, 24 May 2016 15:36:22 +0000 (15:36 +0000)]
Merge "Fix a crash where the deletion helper crashes when app sizes load." into nyc-mr1-dev
Victor Chang [Tue, 24 May 2016 14:46:55 +0000 (15:46 +0100)]
Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation
ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED has been abused.
We should not set onfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED
for work challenge and most other cases.
It's temp fix for the rotation bug. Because it's inconsistent the activity is shown
on top of keyguard with/without rotation (or any config change). In long term,
SHOW_WHEN_LOCKED should be set only if it's truly on purpose, and remove
isKeyguardLocked checking.
Bug:
28878075
Change-Id: I19db913f5bcaf2644c8c46c25e9584103d7fee8a
Victor Chang [Tue, 24 May 2016 14:20:01 +0000 (14:20 +0000)]
Merge "Trust the certificate after unlocking screenlock" into nyc-dev
am:
32e17d0862
* commit '
32e17d08629e745cb21ba381f752ec84d2ed591e':
Trust the certificate after unlocking screenlock
Change-Id: Ib9e51ab5dac5d0f9a7e938a056cd99a0af4c22de
Victor Chang [Tue, 24 May 2016 14:03:28 +0000 (14:03 +0000)]
Merge "Trust the certificate after unlocking screenlock" into nyc-dev
Mahaver Chopra [Tue, 24 May 2016 12:23:20 +0000 (12:23 +0000)]
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev
Mahaver Chopra [Wed, 11 May 2016 17:18:23 +0000 (18:18 +0100)]
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
Bug:
28339424
Change-Id: I2ccba997fc6c9ccfab802c0f49a9e2115a314552
Ricky Wai [Tue, 24 May 2016 10:13:56 +0000 (11:13 +0100)]
Use LockPatternUtils.resetKeyStore() to clear keystore
Bug:
28878708
Change-Id: I6730b6947ea917772809bb045470bdf5e95d86ba
Maurice Lam [Tue, 24 May 2016 00:45:14 +0000 (00:45 +0000)]
Merge "Update margins to match specs" into nyc-mr1-dev
Maurice Lam [Mon, 23 May 2016 21:51:22 +0000 (14:51 -0700)]
Update margins to match specs
- Update settings to use GLIF versions for margins and styles
- Removed learn more link from AOSP Fingerprint intro screen because
it won't have a link to show.
Bug:
28885476
Change-Id: I5d2fd730a1bca2c5da8626da066da3a3f03b4428
Daniel Nishi [Thu, 19 May 2016 23:35:44 +0000 (16:35 -0700)]
Update the storage manager settings to match the mocks.
Bug:
28560570
Change-Id: I0f218da1d23b687e38c52b5a927f7b84645958c7
Daniel Nishi [Mon, 23 May 2016 20:23:47 +0000 (20:23 +0000)]
Merge "Materialize the button bar in the Deletion Helper." into nyc-mr1-dev
Victor Chang [Mon, 23 May 2016 18:47:38 +0000 (19:47 +0100)]
Trust the certificate after unlocking screenlock
When trust button is clicked, if ConfirmCredential (CC) is shown,
and user successfully unlock CC, trust the cert immediately
Bug:
28752364
Change-Id: Ied4aeda59a668a9dd2bf079a385b1fecd8eabb9e
Maurice Lam [Mon, 23 May 2016 17:56:01 +0000 (17:56 +0000)]
Merge "Add skip button to fingerprint settings" into nyc-mr1-dev
Bill Yi [Mon, 23 May 2016 15:42:21 +0000 (15:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
dad7b893b2 -s ours
* commit '
dad7b893b2d2a526f66ed344738c83f24b56106a':
Import translations. DO NOT MERGE
Change-Id: Id29af55504af4e8cae67098379244cb9ec2e2db9
TreeHugger Robot [Mon, 23 May 2016 15:35:34 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Mon, 23 May 2016 15:34:19 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Felipe Leme [Mon, 23 May 2016 13:54:17 +0000 (13:54 +0000)]
Merge "Fixed whitelist stats so it\'s only logged on add." into nyc-dev
am:
b103f4497d
* commit '
b103f4497d0137fb47ebb51d5d26901300071fce':
Fixed whitelist stats so it's only logged on add.
Change-Id: I46dcd529ac09bcf6f152f034847cd11a8d4b24f1
Bill Yi [Mon, 23 May 2016 13:48:26 +0000 (06:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icbe6d3dd29d739afc90790826bee8f0fc2af028e
Auto-generated-cl: translation import
TreeHugger Robot [Mon, 23 May 2016 13:45:55 +0000 (13:45 +0000)]
Merge "Fixed whitelist stats so it's only logged on add." into nyc-dev
Bill Yi [Mon, 23 May 2016 13:35:00 +0000 (06:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I18ff7e3d70d30e76e01214b31c1df2065209f30f
Auto-generated-cl: translation import
Victor Chang [Mon, 23 May 2016 11:59:19 +0000 (11:59 +0000)]
Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev
am:
b0054ec4e2
* commit '
b0054ec4e2275d8d0444b94c0560374630e077f6':
Fix Continous loop in unifed screenlock when trying to Trust a CA cert
Change-Id: I01cd2b287d78484c1653476b75b6d300dec0c34d
Victor Chang [Mon, 23 May 2016 11:51:54 +0000 (11:51 +0000)]
Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:20:05 +0000 (23:20 +0000)]
Import translations. DO NOT MERGE
am:
ffe930ec76 -s ours
* commit '
ffe930ec76e8bf2ca0ffaffffea60b452e1ad88c':
Import translations. DO NOT MERGE
Change-Id: Ie71c67e0abd0b08ced8672cae96d4800337c6992
Baligh Uddin [Sat, 21 May 2016 20:10:17 +0000 (13:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I2ef0467d8a959436073642564afcb8fd25d3d09e
Maurice Lam [Sat, 21 May 2016 02:03:25 +0000 (19:03 -0700)]
Add skip button to fingerprint settings
The landscape layout was missing the fingerprint button
Bug:
28810925
Change-Id: Ic47242abdac61985f86cc4837f1c25801ee1248c
Daniel Nishi [Wed, 18 May 2016 22:38:35 +0000 (15:38 -0700)]
Materialize the button bar in the Deletion Helper.
Older Android style buttons were used for the bottom button bar.
By changing them to use the buttonBarBottomStyle, they are updated
to flat buttons. The bottom button bar for settings preference
fragments now more closely tracks the Material Design spec as seen
here in [0].
The other Settings views which use the button bar buttons are the
Redaction settings and WiFi network picker in some contexts. These
should be unaffected as they are based on the SettingsActivity,
rather than the SettingsFragment, and inflate a different view.
[0] https://material-design.storage.googleapis.com/publish/material_v_8/material_ext_publish/0B7WCemMG6e0VaDdZWXpLXzNicjg/components_buttons_usage6.png
Bug:
28845586
Change-Id: I9ea55aa2fe1e76f8f952880675501cbb0f76719d
Felipe Leme [Fri, 20 May 2016 22:06:06 +0000 (22:06 +0000)]
Merge "Defined help page for Data Saver." into nyc-dev
am:
f8265a8f1e
* commit '
f8265a8f1ed751d93ef15596658b82748d2a8d28':
Defined help page for Data Saver.
Change-Id: I1430270ab4ac368a6909038ad90816ba67e1d664
Adrian Roos [Fri, 20 May 2016 21:36:22 +0000 (14:36 -0700)]
Remove option to configure emergency app
Bug:
28873644
Change-Id: Iddf4e781af8cb3ca3b62d1141c58402933bd8ec8
Felipe Leme [Fri, 20 May 2016 21:27:57 +0000 (21:27 +0000)]
Merge "Defined help page for Data Saver." into nyc-dev
Felipe Leme [Fri, 20 May 2016 21:13:22 +0000 (14:13 -0700)]
Fixed whitelist stats so it's only logged on add.
BUG:
28166693
Change-Id: If1f91167c21054e78a966670c20c174c3f73d2a5
Daniel Nishi [Fri, 20 May 2016 21:11:27 +0000 (14:11 -0700)]
Fix a crash where the deletion helper crashes when app sizes load.
This was caused by a change I made to the extraInfo on the app.
The extra info used to be a long which was the last usage time.
I changed it to a UsageStatsState and missed this usage of it.
The attempted cast to long caused a crash.
Bug:
28885317
Change-Id: Ie0d6bcea5d0afccd2762acd19d628c742c7e3db9
Jason Monk [Fri, 20 May 2016 18:24:35 +0000 (18:24 +0000)]
Merge "Protect against monkey crash" into nyc-dev
am:
d3ce331b94
* commit '
d3ce331b94af2c896864f78459c8656629d3455f':
Protect against monkey crash
Change-Id: Ie079d13887e9159d78ef5485bfa96878cee01d6a