OSDN Git Service
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
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 [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
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
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
Jason Monk [Fri, 20 May 2016 18:21:08 +0000 (18:21 +0000)]
Merge "Protect against monkey crash" into nyc-dev
Jason Monk [Fri, 20 May 2016 18:15:10 +0000 (14:15 -0400)]
Protect against monkey crash
When rebuild comes in after context is no longer valid
Change-Id: Ib64e93372bff4c6b0e1232ac257f3df0e9d0be0a
Fixes:
28875397
Victor Chang [Fri, 13 May 2016 16:06:59 +0000 (17:06 +0100)]
Fix Continous loop in unifed screenlock when trying to Trust a CA cert
Cause: with unified screenlock, ConfirmDeviceCredentialActivity didn't
forward result with FLAG_ACTIVITY_FORWARD_RESULT
Also, fixed that ConfirmDeviceCredentialActivity didn't allow fingerprint
authenication in unified screenlock after keystore unlocked.
In ChooseLockSettingsHelper, add one new util function to allow
extra option to set returnCredentials to false while external to true.
Set StrongAuth to "not required" when it has been successfully unlocked.
Test:
1. PO Unified Screenlock/Work Challenge x fingerprint -> ok to trust cert
(Also, no credential is returned in intent)
2. WorkMode off -> Reboot -> turn on Work mode
-> no fingerprint option, PIN unlock successful to turn work mode on
Bug:
28752364
Change-Id: I6dc8865e8f005545f8577d7731afb4495647062b
Victor Chang [Fri, 20 May 2016 17:30:38 +0000 (17:30 +0000)]
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev
am:
99a88eca78
* commit '
99a88eca7840af3cee8ab13a82c12e3217ea6120':
Temp fix for NPE when race condition happens in TrustedCredentialsSettings
Change-Id: I9106b6bee11927b909fcfbc417941d0cead07691
Victor Chang [Fri, 20 May 2016 17:19:42 +0000 (17:19 +0000)]
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev
Victor Chang [Tue, 17 May 2016 15:50:08 +0000 (16:50 +0100)]
Temp fix for NPE when race condition happens in TrustedCredentialsSettings
Bug:
28762124
Change-Id: I21e46c2008e106db1c43573171e0d852cbe0a68a
Felipe Leme [Fri, 20 May 2016 00:07:01 +0000 (17:07 -0700)]
Defined help page for Data Saver.
BUG:
28865521
Change-Id: I07930232312df2775ecee5beacee6921f7245847
Jason Monk [Fri, 20 May 2016 15:10:20 +0000 (15:10 +0000)]
Don\'t use ApplicationsState for summaries
am:
290ca6ec5c
* commit '
290ca6ec5c1f029bff7a43d1d499359e25a41904':
Don't use ApplicationsState for summaries
Change-Id: I09f949a2606e30c9e56d7c9026c3fa306cfa506a
Jason Monk [Thu, 19 May 2016 19:36:55 +0000 (15:36 -0400)]
Don't use ApplicationsState for summaries
Since it grabs a lock that can be slow on the main thread, don't use
ApplicationsState in any of the summaries, instead load the information
directly from the PM.
Change-Id: Ibefe867810d2a9926177a8de4e23a7faea4b1c3b
Fixes:
28435146
Daniel Nishi [Thu, 19 May 2016 21:19:02 +0000 (21:19 +0000)]
Merge "Add a collapsible checkbox preference for deletion helper." into nyc-mr1-dev
TreeHugger Robot [Thu, 19 May 2016 20:41:17 +0000 (20:41 +0000)]
Merge "Display disclaimer dialog before starting support." into nyc-mr1-dev
Fan Zhang [Thu, 12 May 2016 20:25:54 +0000 (13:25 -0700)]
Display disclaimer dialog before starting support.
Bug:
28656426
Bug:
28141203
Change-Id: I4fc0d922170badcf5f215fe906fb616c11cf8270
Sanket Agarwal [Thu, 19 May 2016 18:32:29 +0000 (18:32 +0000)]
Handle return value when Bluetooth is enabled
am:
77ad3c2531
* commit '
77ad3c2531c00c7b654162be826e93abb5e4dc75':
Handle return value when Bluetooth is enabled
Change-Id: I65d2d0b20ed3474f0c8b40a5cd17d12c00283c15
Sanket Agarwal [Wed, 27 Apr 2016 20:22:44 +0000 (13:22 -0700)]
Handle return value when Bluetooth is enabled
If the Bluetooth enable(true) returns false currently we are waiting for
a broadcast (which may not happen if enable returns false). We mark the
toggle to have failed (i.e. it is clickable and in OFF state) and the
switch bar text is appropriately shown.
Bug: b/
28318203
Change-Id: I09ba46d2e102e7f2c4ef9a72bf38dedc1346364f
Daniel Nishi [Thu, 19 May 2016 18:26:43 +0000 (18:26 +0000)]
Merge "Update the deletion helper feature factory for photos and videos." into nyc-mr1-dev
Daniel Nishi [Thu, 12 May 2016 20:07:46 +0000 (13:07 -0700)]
Add a collapsible checkbox preference for deletion helper.
This adds a custom preference group which has both a checkbox
and collapse/expand behavior. This is intended to be used in
the deletion helper for apps deletion and downloads folder
deletion.
This patch implements the apps deletion integration.
Bug:
28769691
Change-Id: I9fb28a1baa4067841742b5dbeaf2083728c16144
Daniel Nishi [Thu, 19 May 2016 17:09:17 +0000 (17:09 +0000)]
Merge "Don't show app in deletion helper if it was installed recently." into nyc-mr1-dev
Daniel Nishi [Tue, 17 May 2016 20:33:29 +0000 (13:33 -0700)]
Update the deletion helper feature factory for photos and videos.
Bug:
28554187
Change-Id: I7fcc34af87ec17e9396f390d851fd31df1dc951a
Daniel Nishi [Thu, 19 May 2016 16:47:50 +0000 (16:47 +0000)]
Merge "Add an upsell dialog to activate the storage manager." into nyc-mr1-dev
Kenny Guy [Thu, 19 May 2016 11:07:59 +0000 (11:07 +0000)]
Merge "Update work challenge background image." into nyc-dev
am:
726085c5c7
* commit '
726085c5c7016a828850580a21e09d2330a20ce4':
Update work challenge background image.
Change-Id: Ie16ea20b5c848814d9bd48b1c704f6a3cc73d35c
Kenny Guy [Thu, 19 May 2016 11:01:37 +0000 (11:01 +0000)]
Merge "Update work challenge background image." into nyc-dev
Baligh Uddin [Wed, 18 May 2016 19:17:05 +0000 (19:17 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
7ffeda3633 -s ours
* commit '
7ffeda3633ee5296e8403da1042ac4e7321a3023':
Import translations. DO NOT MERGE
Change-Id: I49ec349b40cbc6715479d3b0968337f05d4f9b12
Baligh Uddin [Wed, 18 May 2016 19:06:52 +0000 (19:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 18 May 2016 19:06:48 +0000 (19:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Daniel Nishi [Tue, 17 May 2016 18:20:53 +0000 (11:20 -0700)]
Don't show app in deletion helper if it was installed recently.
This solves several problems. The first is that if a user installs
a large app which triggers the deletion helper, the deletion helper
may clear out the recently installed large app to free up space.
The second is that it appears that the usage stats may not be
synced from device to device currently using Backup and Restore.
By considering the installation to be a use for deletion helper
filtering, this should avoid the problem for 60 days (and if the
user hasn't used the app at that point, it should be fair game
to clear).
Bug:
28800057
Change-Id: Idb8545aa45a42e45dc673dc5c179c0197204edfd
Daniel Nishi [Mon, 16 May 2016 19:19:58 +0000 (12:19 -0700)]
Add an upsell dialog to activate the storage manager.
After a manual clear, the user will be prompted to turn
on the storage manager, if it is turned off. The prompt
will only show up after certain defined delay times and
stop showing up entirely if denied enough times.
Currently, the dialog does not actually turn on the storage
manager because the storage manager is not yet landed.
Bug:
28801159
Change-Id: I3c221786d08a7102b3b5357416ab12692d1894cf
Kenny Guy [Wed, 18 May 2016 15:14:19 +0000 (16:14 +0100)]
Update work challenge background image.
Updated so the orange briefcase in the image
isn't central so avoiding clashing with text.
Bug:
28557192
Change-Id: Ic8e4ea71f47449e81619b28b979f59c3d9aaf6a0
Julia Reynolds [Wed, 18 May 2016 14:10:12 +0000 (14:10 +0000)]
Merge "Null check." into nyc-dev
am:
fc1bb74186
* commit '
fc1bb74186c61712041dfa25e446391f7d8904a1':
Null check.
Change-Id: Idbcee7bd10b0f530c7d48760e93cd3f8be3448b5
Julia Reynolds [Wed, 18 May 2016 14:02:05 +0000 (14:02 +0000)]
Merge "Null check." into nyc-dev
Yohei Yukawa [Wed, 18 May 2016 02:24:57 +0000 (02:24 +0000)]
Follow class package change: LocaleList
am:
1ef9c4afd5
* commit '
1ef9c4afd56b534f836c38437624eabaa6691f0b':
Follow class package change: LocaleList
Change-Id: I5c36047c90d110aa241b86ea74b23648526833e8
Yohei Yukawa [Tue, 17 May 2016 22:49:04 +0000 (15:49 -0700)]
Follow class package change: LocaleList
In order to avoid layering violation, LocaleList needs to be moved from
android.util package to android.os package [1]. This CL follows up that
package change.
No behavior change is intended.
[1]: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
Bug:
28819696
Change-Id: Ibd7934b30062046830d63f33d1c6febef32da976
pkanwar [Tue, 17 May 2016 22:31:17 +0000 (22:31 +0000)]
Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev
am:
4dd2fdf90b
* commit '
4dd2fdf90b97b64931cbb1c7ca69b38cef58662e':
Choose Bluetooth Device window cant't fill screen
Change-Id: I92577a0d913f0b8436df28708dc6d84c5c82c01a
Pankaj Kanwar [Tue, 17 May 2016 22:16:48 +0000 (22:16 +0000)]
Merge "Choose Bluetooth Device window cant't fill screen" into nyc-dev
Julia Reynolds [Tue, 17 May 2016 20:14:10 +0000 (16:14 -0400)]
Null check.
Change-Id: I16dfe2cf265b4254aa69bc6165a8f72fc3954d7a
Fixes:
28531037
pkanwar [Tue, 17 May 2016 19:03:42 +0000 (12:03 -0700)]
Choose Bluetooth Device window cant't fill screen
b/
28684861: fixed the layout file to ensure that the separators cover
the entire screen.
Change-Id: I4471a1da901c9a4c0830ff0dfc943cd087ee1702
Felipe Leme [Tue, 17 May 2016 18:39:08 +0000 (18:39 +0000)]
Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev
am:
c769ddd330
* commit '
c769ddd330c7b5734c5c319ef7fc3cabd0c226f8':
Implemented onRestrictBackgroundBlacklistChanged().
Change-Id: Ifb0c4bdfa825948cb18d382c0c8eb29ce3d187b7
TreeHugger Robot [Tue, 17 May 2016 18:28:20 +0000 (18:28 +0000)]
Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev
Daniel Nishi [Tue, 17 May 2016 18:10:51 +0000 (18:10 +0000)]
Merge "Add the automatic storage manager settings." into nyc-mr1-dev
Rachel Zhang [Tue, 17 May 2016 16:51:24 +0000 (16:51 +0000)]
Merge "Remove settings overflow menu" into nyc-mr1-dev
Daniel Nishi [Wed, 11 May 2016 00:35:57 +0000 (17:35 -0700)]
Add the automatic storage manager settings.
This provides a toggle for changing if the storage manager
is turned on or off and how many days of data to retain.
It is currently not hooked up to anything currently and only acts as
the view, pending b/
28600825.
Bug:
28560570
Change-Id: Iaa2d819f26addab4dc02ced80e9ba79e0fcf0980
Daniel Nishi [Tue, 17 May 2016 16:21:27 +0000 (16:21 +0000)]
Merge "Add an alert dialog before clearing data in deletion helper." into nyc-mr1-dev
shwetachahar [Tue, 17 May 2016 14:32:16 +0000 (14:32 +0000)]
Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev
am:
1cb87b2af5
* commit '
1cb87b2af57df71d56951c43aa28b8d01b4fb2a7':
Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element.
Change-Id: I72f2a0a95aadb87031ab53c9d2479f45f3e452ef
Shweta Chahar [Tue, 17 May 2016 14:27:09 +0000 (14:27 +0000)]
Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev
shwetachahar [Fri, 29 Apr 2016 16:14:03 +0000 (17:14 +0100)]
Modify the TTS engine preference UI so that the radio button and the TTS
engine name are a single focusable element.
Bug:
27136946
Change-Id: I502634e0942b9fe30e290ce9de6ba293f33bf863
Baligh Uddin [Tue, 17 May 2016 06:51:59 +0000 (23:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6b058c724477ba0095e43fe4d78460ffff4893e5
Auto-generated-cl: translation import
Baligh Uddin [Tue, 17 May 2016 06:39:18 +0000 (23:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1f10df22a0d22c5408d2c1cc83441e19ffa28405
Auto-generated-cl: translation import
Maurice Lam [Mon, 16 May 2016 23:25:29 +0000 (23:25 +0000)]
Merge "Set fingerprint accent/primary color" into nyc-mr1-dev
Daniel Nishi [Sat, 14 May 2016 01:15:08 +0000 (18:15 -0700)]
Add an alert dialog before clearing data in deletion helper.
The dialog states how much space will be freed by the deletion
and prompts the user to either cancel or continue with the
deletion.
BUG:
28762412
Change-Id: I8db2a8f928c82ebaa2cf5fea030b6b6f4730eb3e
Rachel Zhang [Fri, 13 May 2016 22:13:16 +0000 (15:13 -0700)]
Remove settings overflow menu
Bug:
28139684
Change-Id: I099af85878fde5f2317be312f979994fbbc87287
Felipe Leme [Mon, 16 May 2016 18:36:27 +0000 (11:36 -0700)]
Implemented onRestrictBackgroundBlacklistChanged().
BUG:
28743623
Change-Id: I2d8620360858660fed0e745b16dc61ce262b90b9
Sudheer Shanka [Mon, 16 May 2016 20:22:30 +0000 (20:22 +0000)]
Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev
am:
31fb2a7a1d
* commit '
31fb2a7a1d3ee27ad7f47fb26cd5900b033ef24d':
Fix crash in SetupRedactionInterstitial.
Change-Id: I55d25ec0d3fc06ba099aec098220500ed7c8d61f
Julia Reynolds [Mon, 16 May 2016 20:19:46 +0000 (20:19 +0000)]
Merge "Fix crash on rotation." into nyc-dev
am:
075690875b
* commit '
075690875b437822d23dc38df5e1c02564a7b83e':
Fix crash on rotation.
Change-Id: I08a281fa426b81ebcf0021b89adbe04379d305ec
TreeHugger Robot [Mon, 16 May 2016 20:19:06 +0000 (20:19 +0000)]
Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev
Julia Reynolds [Mon, 16 May 2016 20:12:06 +0000 (20:12 +0000)]
Merge "Fix crash on rotation." into nyc-dev
Julia Reynolds [Mon, 16 May 2016 19:56:15 +0000 (15:56 -0400)]
Fix crash on rotation.
Change-Id: Ife0a040bfc1a6ecc579d544f78cc45e37f5bca3c
Fixes:
28767083
Sudheer Shanka [Mon, 16 May 2016 18:46:34 +0000 (11:46 -0700)]
Fix crash in SetupRedactionInterstitial.
Change-Id: Ia662cd60e4c9eeaccd0eb168431e755c2c79b676
Fixes:
28785168
Julia Reynolds [Mon, 16 May 2016 18:29:16 +0000 (18:29 +0000)]
Merge "Catch rule creation exceptions." into nyc-dev
am:
f1c2e62f4e
* commit '
f1c2e62f4ec00205dc1e78ff66e77d8380d9a6f2':
Catch rule creation exceptions.
Change-Id: Ia0aa67e7aa968b18dc54a4a171780fb283b3bee8
Julia Reynolds [Mon, 16 May 2016 18:22:15 +0000 (18:22 +0000)]
Merge "Catch rule creation exceptions." into nyc-dev
Clara Bayarri [Mon, 16 May 2016 15:09:31 +0000 (15:09 +0000)]
Rename requestKeyboardShortcutsHelper
am:
fcc411c807
* commit '
fcc411c8078e4be5f1f77d7a28b8ce0be20206d5':
Rename requestKeyboardShortcutsHelper
Change-Id: I5333409492e2a64d4015c601714e1d0ec041e54f
Julia Reynolds [Mon, 16 May 2016 13:53:23 +0000 (09:53 -0400)]
Catch rule creation exceptions.
Bug:
28775583
Change-Id: I54c4af0352c88b27717660741709ec54e4749656
Clara Bayarri [Mon, 16 May 2016 13:16:46 +0000 (14:16 +0100)]
Rename requestKeyboardShortcutsHelper
Per API Council feedback
Bug:
28775576
Change-Id: Ia19668dceb7da2222e9716fcb1caff8d0ee86c41
Steven Ng [Mon, 16 May 2016 09:20:42 +0000 (09:20 +0000)]
Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev
Daniel Nishi [Sat, 14 May 2016 01:14:14 +0000 (01:14 +0000)]
Merge "Add an Activity to handle Intents to invoke the Deletion Helper." into nyc-mr1-dev
Daniel Nishi [Sat, 14 May 2016 00:05:01 +0000 (00:05 +0000)]
Merge "Add downloads to the deletion helper." into nyc-mr1-dev
Daniel Nishi [Wed, 4 May 2016 01:00:49 +0000 (18:00 -0700)]
Add an Activity to handle Intents to invoke the Deletion Helper.
This will allow apps to launch the deletion helper when they need to
have space freed up.
To launch the activity using an intent, you can set it as follows:
Intent intent = new Intent(Settings.ACTION_DELETION_HELPER_SETTINGS);
startActivity(intent);
This intent should bring up the Deletion Helper.
Bug:
28675265
Change-Id: I781615ccad4ca1fcae97817ecb823e5dcad67b5b
Sudheer Shanka [Fri, 13 May 2016 21:29:02 +0000 (21:29 +0000)]
Merge "Guard against exception when getting package installer info." into nyc-dev
am:
15c1bb48c3
* commit '
15c1bb48c3da3404a775c7101e3559772aa37d6e':
Guard against exception when getting package installer info.
Change-Id: I3cf5a62c44b12356b48f841a03874f93b1c23981
TreeHugger Robot [Fri, 13 May 2016 21:18:06 +0000 (21:18 +0000)]
Merge "Guard against exception when getting package installer info." into nyc-dev
Daniel Nishi [Wed, 11 May 2016 19:54:13 +0000 (12:54 -0700)]
Add downloads to the deletion helper.
This adds a deletion service to delete files in the Downloads
folder. All of the files there are collected and offered to the
user to delete.
Bug:
28621781
Change-Id: I94431f9abc3a0afa2d07dbab763312c09e830aef
Sudheer Shanka [Fri, 13 May 2016 19:56:34 +0000 (12:56 -0700)]
Guard against exception when getting package installer info.
Bug:
28742227
Change-Id: I8742c882ae6b18cb8f51a9da04170358a20a7d48
Makoto Onuki [Fri, 13 May 2016 18:57:00 +0000 (18:57 +0000)]
Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev
am:
a23cd4614f
* commit '
a23cd4614f0341051e85c3dbdb7766d09c089947':
ShortcutManager: Remove developer option from NYC
Change-Id: Ie49323be5bb7f8b5e258ecb40382463e3cbb847b
Makoto Onuki [Fri, 13 May 2016 18:51:40 +0000 (18:51 +0000)]
Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev
Julia Reynolds [Fri, 13 May 2016 18:22:18 +0000 (18:22 +0000)]
Merge "Don\'t crash on invalid numbers." into nyc-dev
am:
5c401966a3
* commit '
5c401966a3106a223eadabb1fbb156160fdd5222':
Don't crash on invalid numbers.
Change-Id: Ia622b5a3cb31a6ad0a9aebdb1a3cff28c6d4eb04
Daniel Nishi [Fri, 13 May 2016 18:15:28 +0000 (18:15 +0000)]
Merge "Entries in the Deletion Helper should be default unchecked." into nyc-mr1-dev
Julia Reynolds [Fri, 13 May 2016 18:14:58 +0000 (18:14 +0000)]
Merge "Don't crash on invalid numbers." into nyc-dev