diff options
| author | Raj Yengisetty <rajesh@cyngn.com> | 2014-11-10 10:35:00 -0800 |
|---|---|---|
| committer | Adnan <adnan@cyngn.com> | 2014-11-19 15:53:56 -0800 |
| commit | 4e4db4563a7ddf262993a9312781c66d34485ea4 (patch) | |
| tree | afdcf8ce885b656e42e062faca390fba0fb9c484 /res/values/dimens.xml | |
| parent | c2e0e2b87255a1fb002eadf7735e99614b7de656 (diff) | |
| download | android_packages_apps_Trebuchet-4e4db4563a7ddf262993a9312781c66d34485ea4.tar.gz android_packages_apps_Trebuchet-4e4db4563a7ddf262993a9312781c66d34485ea4.tar.bz2 android_packages_apps_Trebuchet-4e4db4563a7ddf262993a9312781c66d34485ea4.zip | |
Protected App [3/3] Trebuchet - Protected Apps - Build fixed to work with LOCAL_SDK_VERSION - Fixed adding components to protected folders and adding protected folders to other folders - Fixed issues with EditText for FolderName - Adding support for Settings hooks - Uses Setting's LockPattern for Protected Apps - Add Read from Settings Secure DB (DO NOT WRITE!) - Protecting a folder updates Launcher without restart - Batch send component visibility
Conflicts:
AndroidManifest.xml
res/values/preferences_defaults.xml
src/com/android/launcher3/AppsCustomizePagedView.java
src/com/android/launcher3/Folder.java
src/com/android/launcher3/FolderIcon.java
src/com/android/launcher3/Launcher.java
src/com/android/launcher3/LauncherModel.java
src/com/android/launcher3/LauncherProvider.java
src/com/android/launcher3/OverviewSettingsPanel.java
Change-Id: I41c295e7f2c9abc9b2e77e6e3d39b7ca60d47139
Diffstat (limited to 'res/values/dimens.xml')
| -rw-r--r-- | res/values/dimens.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index ce24d60b8..29a6c39e2 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -99,6 +99,7 @@ <!-- The amount that the preview contents are inset from the preview background --> <dimen name="folder_preview_padding">4dp</dimen> <dimen name="folder_name_padding">10dp</dimen> + <dimen name="folder_lock_icon">50dp</dimen> <!-- Sizes for managed profile badges --> <dimen name="profile_badge_size">24dp</dimen> |