diff options
| author | Tyson Miller <tmiller@cyngn.com> | 2015-11-10 08:59:15 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-01-28 17:00:28 -0800 |
| commit | 7df0227f6a835641a3d41327a65845806ef070fb (patch) | |
| tree | 3fcf92a1fba468facc675ad47accb08ec2f9f907 /res/layout | |
| parent | 84dfd2a560442953af78aa77dbd6c909aed63589 (diff) | |
| download | android_packages_apps_Trebuchet-7df0227f6a835641a3d41327a65845806ef070fb.tar.gz android_packages_apps_Trebuchet-7df0227f6a835641a3d41327a65845806ef070fb.tar.bz2 android_packages_apps_Trebuchet-7df0227f6a835641a3d41327a65845806ef070fb.zip | |
Port Remote Folder from 12.1 to 13.
Change-Id: If8cf9d5f054e8948ead702883b79f28db26c4d8b
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/all_apps_prediction_bar_icon.xml | 4 | ||||
| -rw-r--r-- | res/layout/custom_predicted_apps_footer.xml | 3 | ||||
| -rw-r--r-- | res/layout/custom_predicted_apps_header.xml | 3 | ||||
| -rw-r--r-- | res/layout/remote_folder.xml | 4 | ||||
| -rw-r--r-- | res/layout/user_folder.xml | 16 |
5 files changed, 23 insertions, 7 deletions
diff --git a/res/layout/all_apps_prediction_bar_icon.xml b/res/layout/all_apps_prediction_bar_icon.xml index 341d8ef4f..0985e95c0 100644 --- a/res/layout/all_apps_prediction_bar_icon.xml +++ b/res/layout/all_apps_prediction_bar_icon.xml @@ -21,8 +21,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:paddingTop="@dimen/all_apps_prediction_icon_top_padding" - android:paddingBottom="@dimen/all_apps_prediction_icon_bottom_padding" + android:paddingTop="@dimen/all_apps_icon_top_bottom_padding" + android:paddingBottom="@dimen/all_apps_icon_top_bottom_padding" android:focusable="true" android:background="@drawable/focusable_view_bg" launcher:iconDisplay="all_apps" /> diff --git a/res/layout/custom_predicted_apps_footer.xml b/res/layout/custom_predicted_apps_footer.xml new file mode 100644 index 000000000..14c171ee6 --- /dev/null +++ b/res/layout/custom_predicted_apps_footer.xml @@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="utf-8"?> +<merge xmlns:android="http://schemas.android.com/apk/res/android"> +</merge>
\ No newline at end of file diff --git a/res/layout/custom_predicted_apps_header.xml b/res/layout/custom_predicted_apps_header.xml new file mode 100644 index 000000000..14c171ee6 --- /dev/null +++ b/res/layout/custom_predicted_apps_header.xml @@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="utf-8"?> +<merge xmlns:android="http://schemas.android.com/apk/res/android"> +</merge>
\ No newline at end of file diff --git a/res/layout/remote_folder.xml b/res/layout/remote_folder.xml new file mode 100644 index 000000000..49d47292d --- /dev/null +++ b/res/layout/remote_folder.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<merge xmlns:android="http://schemas.android.com/apk/res/android"> + +</merge>
\ No newline at end of file diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml index d948ec9ca..516da303c 100644 --- a/res/layout/user_folder.xml +++ b/res/layout/user_folder.xml @@ -20,12 +20,18 @@ android:layout_height="wrap_content" android:background="@drawable/folder_bg" android:elevation="5dp" - android:orientation="vertical" > + android:orientation="vertical" + android:layout_margin="@dimen/folder_margin" + android:layout_gravity="bottom|center_horizontal"> + + <include layout="@layout/remote_folder" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> <FrameLayout android:id="@+id/folder_content_wrapper" - android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_width="wrap_content" + android:layout_height="wrap_content" > <!-- Actual size of the indicator doesn't matter as it is scaled to match the view size --> @@ -36,8 +42,8 @@ <com.android.launcher3.FolderPagedView android:id="@+id/folder_content" - android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:paddingLeft="4dp" android:paddingRight="4dp" android:paddingTop="8dp" |