diff options
author | Winson Chung <winsonc@google.com> | 2015-05-22 11:12:27 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2015-05-22 12:21:40 -0700 |
commit | 5f4e0fdd2e4edeb9211e2dcd1c99497f175731f8 (patch) | |
tree | 3abefdc96cf11c695db912016598157f94a6cca4 /res/layout | |
parent | c6205603efe1f2987caf96504c87d720a25b5a94 (diff) | |
download | android_packages_apps_Trebuchet-5f4e0fdd2e4edeb9211e2dcd1c99497f175731f8.tar.gz android_packages_apps_Trebuchet-5f4e0fdd2e4edeb9211e2dcd1c99497f175731f8.tar.bz2 android_packages_apps_Trebuchet-5f4e0fdd2e4edeb9211e2dcd1c99497f175731f8.zip |
Moving all apps code into sub package.
- Renaming resources, dimens, etc to be more consistent
- Removing old AppsCustomize resources and other unused code
Change-Id: I15ce35e7cb7a9b9344fc7103963e4e4c9e45d89a
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/all_apps.xml (renamed from res/layout/apps_view.xml) | 8 | ||||
-rw-r--r-- | res/layout/all_apps_container.xml (renamed from res/layout/apps_list_view.xml) | 22 | ||||
-rw-r--r-- | res/layout/all_apps_empty_search.xml (renamed from res/layout/apps_empty_view.xml) | 2 | ||||
-rw-r--r-- | res/layout/all_apps_icon.xml (renamed from res/layout/apps_grid_icon_view.xml) | 4 | ||||
-rw-r--r-- | res/layout/all_apps_prediction_bar_icon.xml (renamed from res/layout/apps_prediction_bar_icon_view.xml) | 0 | ||||
-rw-r--r-- | res/layout/all_apps_reveal.xml (renamed from res/layout/apps_reveal_view.xml) | 0 | ||||
-rw-r--r-- | res/layout/app_icon.xml (renamed from res/layout/application.xml) | 0 | ||||
-rw-r--r-- | res/layout/widgets_view.xml | 2 |
8 files changed, 19 insertions, 19 deletions
diff --git a/res/layout/apps_view.xml b/res/layout/all_apps.xml index 7f09f7795..b907c34f1 100644 --- a/res/layout/apps_view.xml +++ b/res/layout/all_apps.xml @@ -16,20 +16,20 @@ <!-- The top and bottom paddings are defined in this container, but since we want the list view to span the full width (for touch interception purposes), we will bake the left/right padding into that view's background itself. --> -<com.android.launcher3.AppsContainerView +<com.android.launcher3.allapps.AllAppsContainerView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/apps_view" android:layout_width="match_parent" android:layout_height="match_parent" android:descendantFocusability="afterDescendants"> <include - layout="@layout/apps_reveal_view" + layout="@layout/all_apps_reveal" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" /> <include - layout="@layout/apps_list_view" + layout="@layout/all_apps_container" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" /> -</com.android.launcher3.AppsContainerView>
\ No newline at end of file +</com.android.launcher3.allapps.AllAppsContainerView>
\ No newline at end of file diff --git a/res/layout/apps_list_view.xml b/res/layout/all_apps_container.xml index 040498359..a20ab46d8 100644 --- a/res/layout/apps_list_view.xml +++ b/res/layout/all_apps_container.xml @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.launcher3.AppsRecyclerViewContainer +<com.android.launcher3.allapps.AllAppsRecyclerViewContainerView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/apps_list" android:layout_width="match_parent" @@ -23,12 +23,12 @@ android:focusableInTouchMode="true" android:visibility="gone" > - <com.android.launcher3.AppsContainerRecyclerView + <com.android.launcher3.allapps.AllAppsRecyclerView android:id="@+id/apps_list_view" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center_horizontal|top" - android:layout_marginTop="@dimen/apps_search_bar_height" + android:layout_marginTop="@dimen/all_apps_search_bar_height" android:clipToPadding="false" android:descendantFocusability="afterDescendants" android:focusable="true" /> @@ -37,7 +37,7 @@ android:id="@+id/prediction_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/apps_search_bar_height" + android:layout_marginTop="@dimen/all_apps_search_bar_height" android:orientation="horizontal" android:descendantFocusability="afterDescendants" android:focusable="true" @@ -49,8 +49,8 @@ <FrameLayout android:id="@+id/header" android:layout_width="match_parent" - android:layout_height="@dimen/apps_search_bar_height" - android:background="@drawable/apps_search_bg" > + android:layout_height="@dimen/all_apps_search_bar_height" + android:background="@drawable/all_apps_search_bg" > <LinearLayout android:id="@+id/app_search_container" @@ -71,14 +71,14 @@ android:paddingTop="13dp" android:src="@drawable/ic_arrow_back_grey" /> - <com.android.launcher3.AppsContainerSearchEditTextView - android:id="@+id/app_search_box" + <com.android.launcher3.allapps.AllAppsSearchEditView + android:id="@+id/apps_search_box" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@android:color/transparent" android:focusableInTouchMode="true" android:gravity="fill_horizontal" - android:hint="@string/apps_view_search_bar_hint" + android:hint="@string/all_apps_search_bar_hint" android:imeOptions="actionDone|flagNoExtractUi" android:maxLines="1" android:paddingBottom="16dp" @@ -98,10 +98,10 @@ android:layout_gravity="end|center_vertical" android:layout_marginEnd="6dp" android:layout_marginRight="6dp" - android:contentDescription="@string/apps_view_search_bar_hint" + android:contentDescription="@string/all_apps_search_bar_hint" android:paddingBottom="13dp" android:paddingTop="13dp" android:src="@drawable/ic_search_grey" /> </FrameLayout> -</com.android.launcher3.AppsRecyclerViewContainer>
\ No newline at end of file +</com.android.launcher3.allapps.AllAppsRecyclerViewContainerView>
\ No newline at end of file diff --git a/res/layout/apps_empty_view.xml b/res/layout/all_apps_empty_search.xml index e4c4e2e8c..f60c4a09a 100644 --- a/res/layout/apps_empty_view.xml +++ b/res/layout/all_apps_empty_search.xml @@ -21,7 +21,7 @@ android:gravity="center" android:paddingTop="24dp" android:paddingBottom="24dp" - android:paddingRight="@dimen/apps_grid_view_start_margin" + android:paddingRight="@dimen/all_apps_grid_view_start_margin" android:textSize="16sp" android:textColor="#4c4c4c" android:focusable="false" /> diff --git a/res/layout/apps_grid_icon_view.xml b/res/layout/all_apps_icon.xml index 7165f383d..10ed25c47 100644 --- a/res/layout/apps_grid_icon_view.xml +++ b/res/layout/all_apps_icon.xml @@ -21,8 +21,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="left|center_vertical" - android:paddingTop="@dimen/apps_icon_top_bottom_padding" - android:paddingBottom="@dimen/apps_icon_top_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/apps_prediction_bar_icon_view.xml b/res/layout/all_apps_prediction_bar_icon.xml index 1e75d14b6..1e75d14b6 100644 --- a/res/layout/apps_prediction_bar_icon_view.xml +++ b/res/layout/all_apps_prediction_bar_icon.xml diff --git a/res/layout/apps_reveal_view.xml b/res/layout/all_apps_reveal.xml index 2951ea4f4..2951ea4f4 100644 --- a/res/layout/apps_reveal_view.xml +++ b/res/layout/all_apps_reveal.xml diff --git a/res/layout/application.xml b/res/layout/app_icon.xml index 831cee5b0..831cee5b0 100644 --- a/res/layout/application.xml +++ b/res/layout/app_icon.xml diff --git a/res/layout/widgets_view.xml b/res/layout/widgets_view.xml index 196dc45e5..2615ddbdd 100644 --- a/res/layout/widgets_view.xml +++ b/res/layout/widgets_view.xml @@ -34,7 +34,7 @@ android:focusable="false" android:visibility="invisible" /> - <com.android.launcher3.widget.WidgetsContainerRecyclerView + <com.android.launcher3.widget.WidgetsRecyclerView android:id="@+id/widgets_list_view" android:layout_width="match_parent" android:layout_height="match_parent" |