OSDN Git Service
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
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
Julia Reynolds [Fri, 13 May 2016 18:01:40 +0000 (14:01 -0400)]
Don't crash on invalid numbers.
Change-Id: I5c1bff5733c5db5f411c2827177b0c1efa1e120e
Fixes:
28756890
Felipe Leme [Fri, 13 May 2016 17:44:41 +0000 (17:44 +0000)]
Merge "Fixed calls to update() when configuration changed." into nyc-dev
am:
f4f2211b13
* commit '
f4f2211b1364422abec41e056af77c03247c3f4e':
Fixed calls to update() when configuration changed.
Change-Id: Ia35d89560fe2dd51d1c0dc8da3d1209c2cb03622
TreeHugger Robot [Fri, 13 May 2016 17:35:20 +0000 (17:35 +0000)]
Merge "Fixed calls to update() when configuration changed." into nyc-dev
Felipe Leme [Fri, 13 May 2016 17:25:33 +0000 (17:25 +0000)]
Merge "Removed onRestrictPowerChanged()." into nyc-dev
am:
85f4269c9f
* commit '
85f4269c9f3c79f19b2263fc15d2404bde0e1f0e':
Removed onRestrictPowerChanged().
Change-Id: Ie44a6664f2fb91a7556d4d8700ce18da8e6512f3
TreeHugger Robot [Fri, 13 May 2016 17:14:11 +0000 (17:14 +0000)]
Merge "Removed onRestrictPowerChanged()." into nyc-dev
Makoto Onuki [Fri, 13 May 2016 16:40:26 +0000 (09:40 -0700)]
ShortcutManager: Remove developer option from NYC
Bug
28704708
Change-Id: Ib2301ea556104e9ffd6a18885e228717843d6acb
Victor Chang [Fri, 13 May 2016 15:12:49 +0000 (15:12 +0000)]
Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev
am:
19c7ef11bd
* commit '
19c7ef11bdc649b3619f421946225d8953218fd1':
Fix NULL instead of DPC name is displayed in Certificate warning
Change-Id: I85bb03da5e85fb401e672783295e5f545dbd10ab
Victor Chang [Fri, 13 May 2016 15:08:17 +0000 (15:08 +0000)]
Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev
Steven Ng [Wed, 27 Apr 2016 14:28:40 +0000 (15:28 +0100)]
Add a Global setting for disabling OEM unlocking setting
+ Don't enable OEM unlocking setting if the global setting disallows it.
Bug:
28163088
Change-Id: Ic306da3fa2cecb90865be055566a7e1603e6b5e2
Victor Chang [Fri, 13 May 2016 13:42:17 +0000 (14:42 +0100)]
Fix NULL instead of DPC name is displayed in Certificate warning
Bug:
28752118
Change-Id: I5a6e17efd92aaea5188d83f2ccb7e7b8d1f1dc1b
Maurice Lam [Fri, 13 May 2016 00:59:26 +0000 (00:59 +0000)]
Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev
am:
102b368172
* commit '
102b368172b4e8201b32efb686b3f3334e5ddbda':
[ScreenLock] Use requested quality for encryption popup
Change-Id: I9373cd533e57006e71e9ea7df064f203994c7217
Maurice Lam [Fri, 13 May 2016 00:51:09 +0000 (00:51 +0000)]
Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev
Maurice Lam [Thu, 12 May 2016 23:24:41 +0000 (16:24 -0700)]
[ScreenLock] Use requested quality for encryption popup
Use the requested password quality instead of the currently-in-use
password quality because encryption interstitial is shown before
the lock type is updated.
Bug:
28326234
Change-Id: I9ae950bab48f62033c59b582218c8a586f5b71ba
Felipe Leme [Thu, 12 May 2016 21:37:11 +0000 (14:37 -0700)]
Fixed calls to update() when configuration changed.
update() is an expensive operation and should only be called
once under normal circumstances (it still needs to be called due to external changes). In particular, it should not be called again on orientation changes.
The first approach to solve the orientation change caused the volume title to not be shown when the screen changed on multi window environments; the fix for title issue caused the update to be called again on configuration changes.
This change properly fixes both issues by removing the onAttach() / onDetach() methods and using a clearer variable (mNeedsUpdate) to avoid future regressions.
BUG:
24508289
BUG:
27989238
Change-Id: I140f5a541cda293f1c476d3b80a5bc8918e18b08
Adrian Roos [Thu, 12 May 2016 20:59:47 +0000 (20:59 +0000)]
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
am:
ef505d628a
* commit '
ef505d628ae96f175fca871013da8c24271667dc':
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: I5746a924564e8eb866b0c0e0a1e0205a38896f89
Adrian Roos [Thu, 12 May 2016 20:52:24 +0000 (20:52 +0000)]
Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
Adrian Roos [Wed, 11 May 2016 19:49:20 +0000 (15:49 -0400)]
Allow DPMs to restrict Remote Input on Keyguard
Change-Id: I84b90b4047129794f1397351f9c8624f0048ad41
Fixes:
26981262
Fan Zhang [Thu, 12 May 2016 18:41:10 +0000 (18:41 +0000)]
Merge "Update suggestion/support UI to use more negative space." into nyc-mr1-dev
Fan Zhang [Thu, 5 May 2016 00:33:25 +0000 (17:33 -0700)]
Update suggestion/support UI to use more negative space.
Bug:
28435214
-- Tweaked layout and padding in suggestions and support tab.
-- Added support to show different text color in SlidingTabLayout.
Change-Id: If5d90ec5360e35565176aae7475e355c27fcef7c
Julia Reynolds [Thu, 12 May 2016 17:55:56 +0000 (17:55 +0000)]
Merge "Update lock timeout value after pref change." into nyc-dev
am:
1590b8c005
* commit '
1590b8c0055057a392883fe891d21fc659b60813':
Update lock timeout value after pref change.
Change-Id: Ie86247323910b78fe0623a011f677b4e4fd148d2
Julia Reynolds [Thu, 12 May 2016 17:53:26 +0000 (17:53 +0000)]
Merge "Update lock timeout value after pref change." into nyc-dev
Julia Reynolds [Thu, 12 May 2016 17:48:34 +0000 (13:48 -0400)]
Update lock timeout value after pref change.
Change-Id: I0d16256cb61e2db481d99349cd49c17e51de7c87
Fixes:
28734916
Maurice Lam [Thu, 12 May 2016 17:47:45 +0000 (17:47 +0000)]
Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev
am:
aead073d44
* commit '
aead073d4494c6b764cb384cdb96c79ec5a37aa5':
Set Wi-Fi dialog spinners to 48dps tall
Change-Id: I130a82b74299ec5f358f6040e54974e4661e6dbb
Maurice Lam [Thu, 12 May 2016 17:42:19 +0000 (17:42 +0000)]
Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev
Gustav Sennton [Thu, 12 May 2016 13:29:11 +0000 (13:29 +0000)]
Merge "Disable WebViewSetting for non-admin users." into nyc-dev
am:
f76993a9da
* commit '
f76993a9da046ac762ef6cd39b7eb0baa81e8871':
Disable WebViewSetting for non-admin users.
Change-Id: I08f5f7888ee22844aed287d27458149875b0320f
Gustav Sennton [Thu, 12 May 2016 13:23:55 +0000 (13:23 +0000)]
Merge "Disable WebViewSetting for non-admin users." into nyc-dev
Gustav Sennton [Wed, 11 May 2016 11:31:40 +0000 (12:31 +0100)]
Disable WebViewSetting for non-admin users.
For an app to be able to know whether the WebViewSetting is enabled for
a user we disable the setting at boot for non-admin users. In this way
an app can call intent.resolveActivity[Info] for the WebViewSetting
intent to check whether the WebViewSetting is enabled before linking to
it.
Bug:
28034166
Change-Id: I33b3fa10a38f2a2600cddd0891ef746126abdd61
Jim Miller [Thu, 12 May 2016 02:06:50 +0000 (02:06 +0000)]
Merge "Show signal strength indication while in CryptKeeper" into nyc-dev
am:
3086911e25
* commit '
3086911e2578ca7391c46f230edfb0f968dec38e':
Show signal strength indication while in CryptKeeper
Change-Id: If8dcd37239bc2aedeb4fcc97da715c21b4d53639
Jim Miller [Thu, 12 May 2016 01:52:34 +0000 (01:52 +0000)]
Merge "Show signal strength indication while in CryptKeeper" into nyc-dev
Dianne Hackborn [Thu, 12 May 2016 00:51:36 +0000 (00:51 +0000)]
Merge "Fix issue #
28400000: Settings memory UI still showing z-ram..." into nyc-dev
am:
2dec0c7839
* commit '
2dec0c7839784940601df3f2110a552a5cf73400':
Fix issue #
28400000: Settings memory UI still showing z-ram...
Change-Id: Id9e43e234b5aaac86dd94d36ccd051d22ad5bdd4
Dianne Hackborn [Thu, 12 May 2016 00:40:16 +0000 (00:40 +0000)]
Merge "Fix issue #
28400000: Settings memory UI still showing z-ram..." into nyc-dev
Daniel Nishi [Wed, 11 May 2016 22:41:44 +0000 (15:41 -0700)]
Entries in the Deletion Helper should be default unchecked.
Bug:
28669483
Change-Id: I88395db46ffb42b757468936bcdf555bb90c0e75
Maurice Lam [Tue, 10 May 2016 19:45:53 +0000 (12:45 -0700)]
Set Wi-Fi dialog spinners to 48dps tall
Set the minimum height to align with the accessibility guidelines
and to disable ripple projection.
Also adds scroll indicators to the scroll view.
Bug:
28683023
Change-Id: I24c58c0d6e8ef4b9efc8b3f877bcd659f42b6c6d
Dianne Hackborn [Wed, 11 May 2016 21:22:05 +0000 (14:22 -0700)]
Fix issue #
28400000: Settings memory UI still showing z-ram...
...but probably shouldn't.
Change-Id: I3becb68a9989d915d11439b7beec1fe262261f78
Maurice Lam [Wed, 11 May 2016 20:05:18 +0000 (20:05 +0000)]
Merge "Fix truncated text in pattern lock setup" into nyc-mr1-dev
Sudheer Shanka [Wed, 11 May 2016 19:13:46 +0000 (19:13 +0000)]
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev
am:
938501cf76
* commit '
938501cf7634843460b03b6fe954e927166e1257':
Add policy transparency to app notification settings on lockscreen.
Change-Id: I7d9b313218cce94d6711d4ffa5df9a3c99d391c0
Sudheer Shanka [Wed, 11 May 2016 19:04:19 +0000 (19:04 +0000)]
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev
Maurice Lam [Tue, 10 May 2016 01:22:08 +0000 (18:22 -0700)]
Fix truncated text in pattern lock setup
Partially apply ag/708412 to the setup version of the layout. The
rest is not necessary because we assign a weight to the lock pattern
view as well.
Use the short header layout for screens smaller than sw360dp so that
there is more space for the pattern view.
Bug:
28663249
Change-Id: I8cda13834504a345046bc3bf6e0959d613597916
Jason Monk [Wed, 11 May 2016 18:18:37 +0000 (18:18 +0000)]
Merge "Fix unmount up button" into nyc-dev
am:
7680871d92
* commit '
7680871d92cd9fa31a3f515d112767644745f26e':
Fix unmount up button
Change-Id: I4c803b0664abd85956b724b782820920dced6a31
Maurice Lam [Wed, 11 May 2016 18:18:19 +0000 (18:18 +0000)]
Merge "Fix truncated text in pattern lock setup" into nyc-dev
am:
353cdee69e -s ours
* commit '
353cdee69e492f4571025644009024e3a1b10898':
Fix truncated text in pattern lock setup
Change-Id: I3fb29ac80ad857c15128b14076f0c2bf79375ea1
Jason Monk [Wed, 11 May 2016 18:04:57 +0000 (18:04 +0000)]
Merge "Fix unmount up button" into nyc-dev
Maurice Lam [Wed, 11 May 2016 18:04:26 +0000 (18:04 +0000)]
Merge "Fix truncated text in pattern lock setup" into nyc-dev
Jason Monk [Wed, 11 May 2016 17:53:13 +0000 (13:53 -0400)]
Fix unmount up button
Change-Id: I24b388079c438075e3a8652822e7a2fb84fec608
Fixes:
28704198
Jason Monk [Wed, 11 May 2016 16:28:48 +0000 (16:28 +0000)]
Merge "Fix crash in not installed for this user apps" into nyc-dev
am:
a188b2447f
* commit '
a188b2447fa6f1bcb7fbf8a32a2c7425e6e40a69':
Fix crash in not installed for this user apps
Change-Id: I177bc82e5d9848b9981a6ce0b1948094ae19d420
Jason Monk [Wed, 11 May 2016 16:19:04 +0000 (16:19 +0000)]
Merge "Fix crash in not installed for this user apps" into nyc-dev
Jason Monk [Wed, 11 May 2016 15:33:04 +0000 (11:33 -0400)]
Fix crash in not installed for this user apps
Change-Id: I96fa409c5a91cdb6758dbf81714c1c97e28f47b6
Fixes:
28637871
Jason Monk [Wed, 11 May 2016 15:32:47 +0000 (15:32 +0000)]
Merge "Expose dialog for current webview setting." into nyc-dev
am:
f9e62e8d34
* commit '
f9e62e8d3497ea4b738bf6c9a0c72a023eb5b217':
Expose dialog for current webview setting.
Change-Id: Icc624a2ad85a3e119fa5a9893fa89d02e3773b51
Jason Monk [Wed, 11 May 2016 15:27:36 +0000 (15:27 +0000)]
Merge "Expose dialog for current webview setting." into nyc-dev
Jason Monk [Fri, 6 May 2016 19:09:32 +0000 (15:09 -0400)]
Expose dialog for current webview setting.
Change-Id: I91c796b2c75c0ac8047ba0c2555a1036e8c6c616
Fixes:
28554048
Jason Monk [Wed, 11 May 2016 15:16:01 +0000 (15:16 +0000)]
Merge "Protect against case when suggestions haven\'t loaded" into nyc-dev
am:
76f95e82b8
* commit '
76f95e82b861441bccb9f452fe77e1c47acc1d3c':
Protect against case when suggestions haven't loaded
Change-Id: Ie0bc3aa3e696efcec5560860284b457e636bd5bc
Jason Monk [Wed, 11 May 2016 15:06:04 +0000 (15:06 +0000)]
Merge "Protect against case when suggestions haven't loaded" into nyc-dev
Jason Monk [Wed, 11 May 2016 15:01:17 +0000 (11:01 -0400)]
Protect against case when suggestions haven't loaded
Change-Id: I7668ed8af3f1808b619f0fdbd77c2f85da98f607
Fixes:
28691636
Victor Chang [Wed, 11 May 2016 14:52:02 +0000 (14:52 +0000)]
Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev
am:
e8c5eca02d
* commit '
e8c5eca02dab28c7c3860660c9cc8d890ee5a638':
Fix ConfirmCredential is not presented before trusting cert installed by PO/DO
Change-Id: Ife7faac27689a9c364486930d1ecb5ed4cf741c0
Victor Chang [Wed, 11 May 2016 14:43:13 +0000 (14:43 +0000)]
Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev
Jason Monk [Wed, 11 May 2016 14:09:51 +0000 (14:09 +0000)]
Switch fragments to SettingsPreferenceFragment
am:
019aad4c61
* commit '
019aad4c61da0b358782bc3cc59cc2688bb84a39':
Switch fragments to SettingsPreferenceFragment
Change-Id: I15c83cbcda1a8936f8944addd4d6e65ef47415fe
Victor Chang [Mon, 9 May 2016 15:13:10 +0000 (16:13 +0100)]
Fix ConfirmCredential is not presented before trusting cert installed by PO/DO
- Show ConfirmCredential in TrustedCredentialsSettings when Trust button is clicked
for the very first time since the activity launched
- Warning activity (work mode off, crpyto-aware) should not be shown when the activity is started. Also fixed it here.
Bug:
28619980
Change-Id: I084b70883c087376e437a9ad3238d7c3313a0a17
Jason Monk [Tue, 10 May 2016 17:27:20 +0000 (13:27 -0400)]
Switch fragments to SettingsPreferenceFragment
So all basic settings features are supported properly
Change-Id: I1702272cdbc6c13a5d3ca53840113169a37d4d20
Fixes:
28634520
Jason Monk [Wed, 11 May 2016 13:46:42 +0000 (13:46 +0000)]
Merge "Fix crash on rotate pointer speed" into nyc-dev
am:
ab30931d41
* commit '
ab30931d4156afb8ee56c8df3b48fad4703712a7':
Fix crash on rotate pointer speed
Change-Id: I6c73b33e8da5260240c7b6a549151da95c926164
Jason Monk [Wed, 11 May 2016 13:36:53 +0000 (13:36 +0000)]
Merge "Fix crash on rotate pointer speed" into nyc-dev
Felipe Leme [Tue, 10 May 2016 00:29:36 +0000 (17:29 -0700)]
Removed onRestrictPowerChanged().
BUG:
28521946
Change-Id: Ib48030c704cf38541101b600b1e91935302beb9c
TreeHugger Robot [Tue, 10 May 2016 20:31:08 +0000 (20:31 +0000)]
Merge "Add list item to open tips & tricks." into nyc-mr1-dev
Jason Monk [Tue, 10 May 2016 20:26:22 +0000 (20:26 +0000)]
Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev
am:
a50a14a23a
* commit '
a50a14a23a4f57203d01489ddef607f46f485518':
Make sure TileAdapter always has a SuggestionParser
Change-Id: I87ee80fa989079c554c60870b9ddc70d3b36c5e4
Sudheer Shanka [Tue, 10 May 2016 20:26:22 +0000 (20:26 +0000)]
Merge "Update the visibility state of views in UserPreference properly." into nyc-dev
am:
a3b2bdc144
* commit '
a3b2bdc1442c807bfd0bb733221b04dd6eedf1fe':
Update the visibility state of views in UserPreference properly.
Change-Id: I911765978cd757441ba8f6c2e9c83a61b2754ca4
Jason Monk [Tue, 10 May 2016 20:23:16 +0000 (20:23 +0000)]
Merge "Make sure TileAdapter always has a SuggestionParser" into nyc-dev
Sudheer Shanka [Tue, 10 May 2016 20:14:25 +0000 (20:14 +0000)]
Merge "Update the visibility state of views in UserPreference properly." into nyc-dev
Jason Monk [Tue, 10 May 2016 19:41:30 +0000 (15:41 -0400)]
Fix crash on rotate pointer speed
Change-Id: Ie87b0343f153957d7c7129a04690af20361f9063
Fixes:
28641237
Andrew Sapperstein [Tue, 10 May 2016 18:23:13 +0000 (11:23 -0700)]
Add list item to open tips & tricks.
Added to the more help list for now.
BUG:
28654701
Change-Id: Ia020c3ffb5ab42cb82ffa75834fa45d20f2a1e72
Maurice Lam [Tue, 10 May 2016 01:22:08 +0000 (18:22 -0700)]
Fix truncated text in pattern lock setup
Partially apply ag/708412 to the setup version of the layout. The
rest is not necessary because we assign a weight to the lock pattern
view as well.
Use the short header layout for screens smaller than sw360dp so that
there is more space for the pattern view.
Bug:
28663249
Change-Id: I8cda13834504a345046bc3bf6e0959d613597916
Baligh Uddin [Tue, 10 May 2016 18:13:00 +0000 (18:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
7efa4cc6de -s ours
* commit '
7efa4cc6deedd3e5a3443b294698be1c007e25e1':
Import translations. DO NOT MERGE
Change-Id: Ie703cc9ee56a69091d7f570f0a9f07101469f330
Baligh Uddin [Tue, 10 May 2016 18:05:43 +0000 (18:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Tue, 10 May 2016 18:05:40 +0000 (18:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Daniel Nishi [Tue, 10 May 2016 17:50:21 +0000 (17:50 +0000)]
Merge "Create an overlay to add a photo and video deletion helper service." into nyc-mr1-dev
Daniel Nishi [Mon, 2 May 2016 23:39:17 +0000 (16:39 -0700)]
Create an overlay to add a photo and video deletion helper service.
This overlay defines a checkbox preference in the deletion helper for
facilitating the deletion of photos and videos. The service which
provides deletion clearing can be overridden and used to create a
custom photo and video deletion helper.
Bug:
28554187
Bug:
28560856
Change-Id: Id5d9671a307aaac0d1331f055b8f2ab7aa67977c
Baligh Uddin [Tue, 10 May 2016 17:39:45 +0000 (10:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I433f23d9ad9b6831b6a94c5f13dde7fa9e521c3b
Auto-generated-cl: translation import
Jason Monk [Tue, 10 May 2016 17:38:24 +0000 (17:38 +0000)]
Merge "Fix label loading on default home setting" into nyc-dev
am:
cbf2ccbe1b
* commit '
cbf2ccbe1b60fc5958faf7be4f01b775ad2a1d9a':
Fix label loading on default home setting
Change-Id: Idaa6dcdf870bf19bcee6b9696b62dbafeeb3465a
Jason Monk [Tue, 10 May 2016 17:34:08 +0000 (17:34 +0000)]
Merge "Fix label loading on default home setting" into nyc-dev
Baligh Uddin [Tue, 10 May 2016 17:31:18 +0000 (10:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0d63c7faea233cf237002dddebb4fb96a3ecae18
Auto-generated-cl: translation import
Hyunyoung Song [Tue, 10 May 2016 17:21:47 +0000 (17:21 +0000)]
Merge "Revert "Add shortcut manager support to Settings (2/2) b/
28298258" b/
28643184 This reverts commit
79ec6df771b0c05609a611a939f08fcd51f45b74." into nyc-mr1-dev
Hyunyoung Song [Tue, 10 May 2016 17:15:48 +0000 (17:15 +0000)]
Revert "Add shortcut manager support to Settings (2/2) b/
28298258"
b/
28643184
This reverts commit
79ec6df771b0c05609a611a939f08fcd51f45b74.
Change-Id: I3de8a27e88a5a84825e914725259530b22756da0
Jason Monk [Tue, 10 May 2016 17:03:35 +0000 (13:03 -0400)]
Make sure TileAdapter always has a SuggestionParser
Since it expects to have one
Change-Id: Ic0dccd2271c011cf7dc877e341af5a8bfea90c37
Fixes:
28689801
Jason Monk [Tue, 10 May 2016 16:47:37 +0000 (12:47 -0400)]
Fix label loading on default home setting
Change-Id: Ia7d00eaf48eb703b766c760b6140ea98be5490f1
Fixes:
28668320
Victor Chang [Tue, 10 May 2016 14:35:53 +0000 (14:35 +0000)]
Merge "Show a different Root CA string for device owner" into nyc-dev
am:
9c31684bbe
* commit '
9c31684bbe449e320e5174a2fcee4ab1900e182c':
Show a different Root CA string for device owner
Change-Id: I1d22ab807c576483ffc29cc459e7c321a38fb1a1
Victor Chang [Tue, 10 May 2016 14:29:38 +0000 (14:29 +0000)]
Merge "Show a different Root CA string for device owner" into nyc-dev
Felipe Leme [Mon, 9 May 2016 20:05:38 +0000 (20:05 +0000)]
Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev
am:
8c3b5fa3cf
* commit '
8c3b5fa3cf14efa3677a3c6cc666900503c15ea0':
Added title for stand-alone App Data Usage activitiy.
Change-Id: Ifb78da77b270aab297ba67037a85a37cc26a769a
TreeHugger Robot [Mon, 9 May 2016 19:50:10 +0000 (19:50 +0000)]
Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev
Fan Zhang [Mon, 9 May 2016 19:48:22 +0000 (19:48 +0000)]
Merge "Fix crash when rotating screen in a few screens." into nyc-dev
am:
2728874605
* commit '
2728874605ef6dc19c901c39663d04c7087e8cda':
Fix crash when rotating screen in a few screens.
Change-Id: I5fa56a9910016e76d30a845fa4578f07eb2229e5