Launcher2 is now Launcher3.
Changes include
- moving from com.android.launcher{,2} to
com.android.launcher3
- removing wallpapers
- new temporary icon
Change-Id: I1eabd06059e94a8f3bdf6b620777bd1d2b7c212b
diff --git a/res/layout-sw720dp/all_apps_cling.xml b/res/layout-sw720dp/all_apps_cling.xml
index d6e19d3..824d84f 100644
--- a/res/layout-sw720dp/all_apps_cling.xml
+++ b/res/layout-sw720dp/all_apps_cling.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Cling
+<com.android.launcher3.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
launcher:drawIdentifier="all_apps_large">
<FrameLayout
android:layout_width="match_parent"
@@ -43,4 +43,4 @@
android:onClick="dismissAllAppsCling" />
</LinearLayout>
</FrameLayout>
-</com.android.launcher2.Cling>
+</com.android.launcher3.Cling>
diff --git a/res/layout-sw720dp/folder_cling.xml b/res/layout-sw720dp/folder_cling.xml
index f66da7b..4193838 100644
--- a/res/layout-sw720dp/folder_cling.xml
+++ b/res/layout-sw720dp/folder_cling.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Cling
+<com.android.launcher3.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
launcher:drawIdentifier="folder_large">
<FrameLayout
android:layout_width="match_parent"
@@ -43,4 +43,4 @@
android:onClick="dismissFolderCling" />
</LinearLayout>
</FrameLayout>
-</com.android.launcher2.Cling>
+</com.android.launcher3.Cling>
diff --git a/res/layout-sw720dp/hotseat.xml b/res/layout-sw720dp/hotseat.xml
index a8faf36..f69f68d 100644
--- a/res/layout-sw720dp/hotseat.xml
+++ b/res/layout-sw720dp/hotseat.xml
@@ -13,12 +13,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Hotseat
+<com.android.launcher3.Hotseat
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
launcher:cellCountX="@integer/hotseat_cell_count"
launcher:cellCountY="1">
- <com.android.launcher2.CellLayout
+ <com.android.launcher3.CellLayout
android:id="@+id/layout"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@@ -33,4 +33,4 @@
launcher:widthGap="@dimen/hotseat_width_gap"
launcher:heightGap="@dimen/hotseat_height_gap"
launcher:maxGap="@dimen/hotseat_width_gap" />
-</com.android.launcher2.Hotseat>
+</com.android.launcher3.Hotseat>
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index 2bacf36..d798aff 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -17,14 +17,14 @@
<!-- Full screen view projects under the status bar and contains the background -->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
android:id="@+id/launcher"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/workspace_bg">
- <com.android.launcher2.DragLayer
+ <com.android.launcher3.DragLayer
android:id="@+id/drag_layer"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -49,7 +49,7 @@
android:layout_marginBottom="@dimen/button_bar_height_plus_padding" />
<!-- The workspace contains 5 screens of cells -->
- <com.android.launcher2.Workspace
+ <com.android.launcher3.Workspace
android:id="@+id/workspace"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -69,7 +69,7 @@
<include android:id="@+id/cell3" layout="@layout/workspace_screen" />
<include android:id="@+id/cell4" layout="@layout/workspace_screen" />
<include android:id="@+id/cell5" layout="@layout/workspace_screen" />
- </com.android.launcher2.Workspace>
+ </com.android.launcher3.Workspace>
<include layout="@layout/hotseat"
android:id="@+id/hotseat"
@@ -96,7 +96,7 @@
android:layout_height="match_parent"
android:visibility="gone" />
- <com.android.launcher2.DrawableStateProxyView
+ <com.android.launcher3.DrawableStateProxyView
android:id="@+id/voice_button_proxy"
android:layout_width="80dp"
android:layout_height="@dimen/qsb_bar_height"
@@ -112,5 +112,5 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="invisible" />
- </com.android.launcher2.DragLayer>
+ </com.android.launcher3.DragLayer>
</FrameLayout>
diff --git a/res/layout-sw720dp/search_bar.xml b/res/layout-sw720dp/search_bar.xml
index 7cf79b8..44c969b 100644
--- a/res/layout-sw720dp/search_bar.xml
+++ b/res/layout-sw720dp/search_bar.xml
@@ -15,14 +15,14 @@
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
style="@style/SearchDropTargetBar"
android:layout_width="match_parent"
android:layout_height="@dimen/search_bar_height"
android:layout_gravity="bottom|center_horizontal"
android:background="@drawable/search_frame">
<!-- Global search icon -->
- <com.android.launcher2.HolographicLinearLayout
+ <com.android.launcher3.HolographicLinearLayout
style="@style/SearchButton"
launcher:sourceImageViewId="@+id/search_button"
android:id="@+id/search_button_container"
@@ -43,10 +43,10 @@
android:layout_height="match_parent"
android:src="@drawable/ic_home_search_normal_holo"
android:adjustViewBounds="true" />
- </com.android.launcher2.HolographicLinearLayout>
+ </com.android.launcher3.HolographicLinearLayout>
<!-- Voice search icon -->
- <com.android.launcher2.HolographicLinearLayout
+ <com.android.launcher3.HolographicLinearLayout
style="@style/SearchButton"
launcher:sourceImageViewId="@+id/voice_button"
android:id="@+id/voice_button_container"
@@ -67,5 +67,5 @@
android:layout_height="match_parent"
android:src="@drawable/ic_home_voice_search_holo"
android:adjustViewBounds="true" />
- </com.android.launcher2.HolographicLinearLayout>
+ </com.android.launcher3.HolographicLinearLayout>
</RelativeLayout>
diff --git a/res/layout-sw720dp/wallpaper_item.xml b/res/layout-sw720dp/wallpaper_item.xml
index 9461e3b..f3c3217 100644
--- a/res/layout-sw720dp/wallpaper_item.xml
+++ b/res/layout-sw720dp/wallpaper_item.xml
@@ -23,4 +23,4 @@
android:layout_height="@dimen/wallpaper_chooser_grid_height"
android:scaleType="centerCrop"
android:focusable="true" />
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/layout-sw720dp/workspace.xml b/res/layout-sw720dp/workspace.xml
index bf2abfd..00ed529 100644
--- a/res/layout-sw720dp/workspace.xml
+++ b/res/layout-sw720dp/workspace.xml
@@ -16,9 +16,9 @@
<!-- The workspace contains 5 screens of cells -->
-<com.android.launcher2.Workspace
+<com.android.launcher3.Workspace
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
android:paddingStart="@dimen/workspace_left_padding"
android:paddingEnd="@dimen/workspace_right_padding"
android:paddingTop="@dimen/workspace_top_padding"
@@ -30,4 +30,4 @@
<include android:id="@+id/cell3" layout="@layout/workspace_screen" />
<include android:id="@+id/cell4" layout="@layout/workspace_screen" />
<include android:id="@+id/cell5" layout="@layout/workspace_screen" />
-</com.android.launcher2.Workspace>
\ No newline at end of file
+</com.android.launcher3.Workspace>
diff --git a/res/layout-sw720dp/workspace_cling.xml b/res/layout-sw720dp/workspace_cling.xml
index ca71a3b..052e1a0 100644
--- a/res/layout-sw720dp/workspace_cling.xml
+++ b/res/layout-sw720dp/workspace_cling.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Cling
+<com.android.launcher3.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
android:layout_width="match_parent"
android:layout_height="match_parent"
launcher:drawIdentifier="workspace_portrait">
@@ -59,4 +59,4 @@
android:layout_marginEnd="10dp"
android:layout_gravity="bottom|end"
android:onClick="dismissWorkspaceCling" />
-</com.android.launcher2.Cling>
+</com.android.launcher3.Cling>