From 888b3a10bf1e99192f12c844ee275c6f360d6b34 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 13 Mar 2015 11:14:16 -0700
Subject: Minor changes to apps view.

- Ensuring that apps with numbers and in other locals have a section header.
- Adding an empty state when there are no apps with the current filter
- Removing unnecessary call to check AppInfos

Change-Id: I9dc541c680475b98745fa257ad7e4af06e3966c9
---
 res/layout-sw600dp/apps_view.xml     |  2 +-
 res/layout/apps_empty_view.xml       | 28 ++++++++++++++++++++++++++++
 res/layout/apps_list_reveal_view.xml | 25 -------------------------
 res/layout/apps_reveal_view.xml      | 25 +++++++++++++++++++++++++
 res/layout/apps_view.xml             |  2 +-
 res/values/strings.xml               |  4 ++++
 6 files changed, 59 insertions(+), 27 deletions(-)
 create mode 100644 res/layout/apps_empty_view.xml
 delete mode 100644 res/layout/apps_list_reveal_view.xml
 create mode 100644 res/layout/apps_reveal_view.xml

(limited to 'res')

diff --git a/res/layout-sw600dp/apps_view.xml b/res/layout-sw600dp/apps_view.xml
index 3bb6ec505..0628ca6d3 100644
--- a/res/layout-sw600dp/apps_view.xml
+++ b/res/layout-sw600dp/apps_view.xml
@@ -22,7 +22,7 @@
     android:background="#22000000"
     android:descendantFocusability="afterDescendants">
     <include
-        layout="@layout/apps_list_reveal_view"
+        layout="@layout/apps_reveal_view"
         android:layout_width="@dimen/apps_container_width"
         android:layout_height="540dp"
         android:layout_gravity="center" />
diff --git a/res/layout/apps_empty_view.xml b/res/layout/apps_empty_view.xml
new file mode 100644
index 000000000..8408077a2
--- /dev/null
+++ b/res/layout/apps_empty_view.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/empty_text"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:paddingTop="24dp"
+    android:paddingBottom="24dp"
+    android:paddingRight="@dimen/apps_grid_view_start_margin"
+    android:textSize="16sp"
+    android:textColor="#4c4c4c"
+    android:focusable="false" />
+
diff --git a/res/layout/apps_list_reveal_view.xml b/res/layout/apps_list_reveal_view.xml
deleted file mode 100644
index 19e462bee..000000000
--- a/res/layout/apps_list_reveal_view.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/apps_view_transition_overlay"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_gravity="center"
-    android:elevation="15dp"
-    android:visibility="invisible"
-    android:background="@drawable/apps_list_bg"
-    android:focusable="false" />
\ No newline at end of file
diff --git a/res/layout/apps_reveal_view.xml b/res/layout/apps_reveal_view.xml
new file mode 100644
index 000000000..19e462bee
--- /dev/null
+++ b/res/layout/apps_reveal_view.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/apps_view_transition_overlay"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:elevation="15dp"
+    android:visibility="invisible"
+    android:background="@drawable/apps_list_bg"
+    android:focusable="false" />
\ No newline at end of file
diff --git a/res/layout/apps_view.xml b/res/layout/apps_view.xml
index c1bae63f6..00f3cca88 100644
--- a/res/layout/apps_view.xml
+++ b/res/layout/apps_view.xml
@@ -22,7 +22,7 @@
     android:background="@drawable/apps_customize_bg"
     android:descendantFocusability="afterDescendants">
     <include
-        layout="@layout/apps_list_reveal_view" />
+        layout="@layout/apps_reveal_view" />
     <include
         layout="@layout/apps_list_view" />
 </com.android.launcher3.AppsContainerView>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0d113dbf7..408109d15 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -74,6 +74,10 @@
     <!-- Apps view -->
     <!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->
     <string name="apps_view_search_bar_hint">Search Apps</string>
+    <!-- Loading apps text. [CHAR_LIMIT=50] -->
+    <string name="loading_apps_message">Loading Apps...</string>
+    <!-- No-search-results text. [CHAR_LIMIT=50] -->
+    <string name="apps_view_no_search_results">No Apps found matching \"<xliff:g id="query" example="Android">%1$s</xliff:g>\"</string>
 
     <!-- Folders -->
     <skip />
-- 
cgit v1.2.3