diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-05-09 20:43:21 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-06-08 15:00:09 -0700 |
| commit | 3333b0ced8e6743c41909f6f6b916f1f9ec5a004 (patch) | |
| tree | 7fd735821e3393a0dfe8691087f58ebbaa9dafae /res/layout/user_folder_icon_normalized.xml | |
| parent | ab06999a70c773ffbc0aadaf938e0e90f8ca09b2 (diff) | |
| download | android_packages_apps_Trebuchet-3333b0ced8e6743c41909f6f6b916f1f9ec5a004.tar.gz android_packages_apps_Trebuchet-3333b0ced8e6743c41909f6f6b916f1f9ec5a004.tar.bz2 android_packages_apps_Trebuchet-3333b0ced8e6743c41909f6f6b916f1f9ec5a004.zip | |
Unifying focus indicator handling for workspace and all-apps
Adding an abstract FocusIndicatorHelper based on FocusIndicatorView
which draws the background instead of using a dummy view.
Change-Id: Id560195323d2ddad8fcd77ba675cf3f4fd4a94ab
Diffstat (limited to 'res/layout/user_folder_icon_normalized.xml')
| -rw-r--r-- | res/layout/user_folder_icon_normalized.xml | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/res/layout/user_folder_icon_normalized.xml b/res/layout/user_folder_icon_normalized.xml index de1316ebb..bb6bd765b 100644 --- a/res/layout/user_folder_icon_normalized.xml +++ b/res/layout/user_folder_icon_normalized.xml @@ -22,27 +22,14 @@ android:elevation="5dp" android:orientation="vertical" > - <FrameLayout - android:id="@+id/folder_content_wrapper" + <com.android.launcher3.folder.FolderPagedView + android:id="@+id/folder_content" android:layout_width="match_parent" - android:layout_height="match_parent" > - - <!-- Actual size of the indicator doesn't matter as it is scaled to match the view size --> - - <com.android.launcher3.FocusIndicatorView - android:id="@+id/focus_indicator" - android:layout_width="20dp" - android:layout_height="20dp" /> - - <com.android.launcher3.folder.FolderPagedView - android:id="@+id/folder_content" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingTop="8dp" - launcher:pageIndicator="@+id/folder_page_indicator" /> - </FrameLayout> + android:layout_height="match_parent" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="8dp" + launcher:pageIndicator="@+id/folder_page_indicator" /> <LinearLayout android:id="@+id/folder_footer" |