diff options
Diffstat (limited to 'res')
51 files changed, 129 insertions, 152 deletions
diff --git a/res/drawable/wallpaper_gallery_background.xml b/res/drawable/wallpaper_gallery_background.xml index 271c1dfb8..283b4684c 100644 --- a/res/drawable/wallpaper_gallery_background.xml +++ b/res/drawable/wallpaper_gallery_background.xml @@ -17,4 +17,4 @@ <shape xmlns:android="http://schemas.android.com/apk/res/android"> <gradient android:startColor="#0000" android:endColor="#D0000000" android:angle="270"/> -</shape>
\ No newline at end of file +</shape> diff --git a/res/layout-land/all_apps_cling.xml b/res/layout-land/all_apps_cling.xml index fccf400af..820f00a6d 100644 --- a/res/layout-land/all_apps_cling.xml +++ b/res/layout-land/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_landscape"> <FrameLayout android:layout_width="match_parent" @@ -45,4 +45,4 @@ android:layout_marginEnd="10dp" android:layout_gravity="bottom|end" android:onClick="dismissAllAppsCling" /> -</com.android.launcher2.Cling> +</com.android.launcher3.Cling> diff --git a/res/layout-land/application.xml b/res/layout-land/application.xml index 9ed1fa115..d20e1be1e 100644 --- a/res/layout-land/application.xml +++ b/res/layout-land/application.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/WorkspaceIcon.Landscape" android:focusable="true" android:background="@drawable/focusable_view_bg" /> diff --git a/res/layout-land/apps_customize_application.xml b/res/layout-land/apps_customize_application.xml index ba95b27a6..bf0022d76 100644 --- a/res/layout-land/apps_customize_application.xml +++ b/res/layout-land/apps_customize_application.xml @@ -14,9 +14,9 @@ limitations under the License. --> -<com.android.launcher2.PagedViewIcon +<com.android.launcher3.PagedViewIcon 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/WorkspaceIcon.Landscape.AppsCustomize" diff --git a/res/layout-land/folder_cling.xml b/res/layout-land/folder_cling.xml index b39fbb1b5..275edeead 100644 --- a/res/layout-land/folder_cling.xml +++ b/res/layout-land/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_landscape"> <FrameLayout android:layout_width="match_parent" @@ -45,4 +45,4 @@ android:layout_marginEnd="10dp" android:layout_gravity="bottom|end" android:onClick="dismissFolderCling" /> -</com.android.launcher2.Cling> +</com.android.launcher3.Cling> diff --git a/res/layout-land/folder_icon.xml b/res/layout-land/folder_icon.xml index 808ff5e7b..32d729802 100644 --- a/res/layout-land/folder_icon.xml +++ b/res/layout-land/folder_icon.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<com.android.launcher2.FolderIcon +<com.android.launcher3.FolderIcon xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" @@ -27,7 +27,7 @@ android:layout_width="@dimen/folder_preview_size" android:layout_height="@dimen/folder_preview_size" android:src="@drawable/portal_ring_inner_holo"/> - <com.android.launcher2.BubbleTextView + <com.android.launcher3.BubbleTextView android:id="@+id/folder_icon_name" style="@style/WorkspaceIcon.Landscape.Folder"/> -</com.android.launcher2.FolderIcon> +</com.android.launcher3.FolderIcon> diff --git a/res/layout-land/hotseat.xml b/res/layout-land/hotseat.xml index aebb21842..f2d2b00e7 100644 --- a/res/layout-land/hotseat.xml +++ b/res/layout-land/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="1" launcher:cellCountY="@integer/hotseat_cell_count"> - <com.android.launcher2.CellLayout + <com.android.launcher3.CellLayout android:id="@+id/layout" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -33,4 +33,4 @@ launcher:widthGap="@dimen/hotseat_width_gap" launcher:heightGap="@dimen/hotseat_height_gap" launcher:maxGap="@dimen/workspace_max_gap" /> -</com.android.launcher2.Hotseat> +</com.android.launcher3.Hotseat> diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 88490987b..02cde57d0 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -17,21 +17,21 @@ <!-- 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" android:fitsSystemWindows="true"> <!-- 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" @@ -51,7 +51,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 android:id="@+id/qsb_divider" @@ -101,7 +101,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="@dimen/qsb_bar_height" android:layout_height="@dimen/app_icon_size" @@ -117,5 +117,5 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" /> - </com.android.launcher2.DragLayer> -</FrameLayout>
\ No newline at end of file + </com.android.launcher3.DragLayer> +</FrameLayout> diff --git a/res/layout-land/search_bar.xml b/res/layout-land/search_bar.xml index 8cdee942c..ab36361fe 100644 --- a/res/layout-land/search_bar.xml +++ b/res/layout-land/search_bar.xml @@ -19,7 +19,7 @@ android:layout_height="match_parent" android:orientation="vertical"> <!-- Global search icon --> - <com.android.launcher2.HolographicImageView + <com.android.launcher3.HolographicImageView style="@style/SearchButton" android:id="@+id/search_button" android:layout_width="match_parent" @@ -34,7 +34,7 @@ android:contentDescription="@string/accessibility_search_button" /> <!-- Voice search icon --> - <com.android.launcher2.HolographicImageView + <com.android.launcher3.HolographicImageView style="@style/SearchButton" android:id="@+id/voice_button" android:layout_width="match_parent" diff --git a/res/layout-land/workspace_cling.xml b/res/layout-land/workspace_cling.xml index 43d2a816f..8bd9e351f 100644 --- a/res/layout-land/workspace_cling.xml +++ b/res/layout-land/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_landscape"> @@ -56,4 +56,4 @@ android:layout_marginEnd="10dp" android:layout_gravity="bottom|end" android:onClick="dismissWorkspaceCling" /> -</com.android.launcher2.Cling> +</com.android.launcher3.Cling> diff --git a/res/layout-port/all_apps_cling.xml b/res/layout-port/all_apps_cling.xml index 6954fb212..62284ec73 100644 --- a/res/layout-port/all_apps_cling.xml +++ b/res/layout-port/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_portrait"> <FrameLayout android:layout_width="match_parent" @@ -45,4 +45,4 @@ android:layout_marginEnd="10dp" android:layout_gravity="bottom|end" android:onClick="dismissAllAppsCling" /> -</com.android.launcher2.Cling> +</com.android.launcher3.Cling> diff --git a/res/layout-port/application.xml b/res/layout-port/application.xml index ddc835420..4dcc774d7 100644 --- a/res/layout-port/application.xml +++ b/res/layout-port/application.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/WorkspaceIcon.Portrait" android:focusable="true" android:background="@drawable/focusable_view_bg" /> diff --git a/res/layout-port/apps_customize_application.xml b/res/layout-port/apps_customize_application.xml index 84a8712d7..0b7bab6c5 100644 --- a/res/layout-port/apps_customize_application.xml +++ b/res/layout-port/apps_customize_application.xml @@ -14,9 +14,9 @@ limitations under the License. --> -<com.android.launcher2.PagedViewIcon +<com.android.launcher3.PagedViewIcon 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/WorkspaceIcon.Portrait.AppsCustomize" diff --git a/res/layout-port/folder_cling.xml b/res/layout-port/folder_cling.xml index 820675d1d..b91578fdb 100644 --- a/res/layout-port/folder_cling.xml +++ b/res/layout-port/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_portrait"> <FrameLayout android:layout_width="match_parent" @@ -46,4 +46,4 @@ android:layout_marginEnd="10dp" android:layout_gravity="bottom|end" android:onClick="dismissFolderCling" /> -</com.android.launcher2.Cling> +</com.android.launcher3.Cling> diff --git a/res/layout-port/folder_icon.xml b/res/layout-port/folder_icon.xml index 5ee1327a3..686fb170c 100644 --- a/res/layout-port/folder_icon.xml +++ b/res/layout-port/folder_icon.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<com.android.launcher2.FolderIcon +<com.android.launcher3.FolderIcon xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" @@ -27,7 +27,7 @@ android:layout_width="@dimen/folder_preview_size" android:layout_height="@dimen/folder_preview_size" android:src="@drawable/portal_ring_inner_holo"/> - <com.android.launcher2.BubbleTextView + <com.android.launcher3.BubbleTextView android:id="@+id/folder_icon_name" style="@style/WorkspaceIcon.Portrait.Folder"/> -</com.android.launcher2.FolderIcon> +</com.android.launcher3.FolderIcon> diff --git a/res/layout-port/hotseat.xml b/res/layout-port/hotseat.xml index 4ca0bb820..cab20b2da 100644 --- a/res/layout-port/hotseat.xml +++ b/res/layout-port/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/workspace_max_gap" /> -</com.android.launcher2.Hotseat> +</com.android.launcher3.Hotseat> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 346d29b5a..780f4366e 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/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" /> <!-- 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" @@ -111,5 +111,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-port/search_bar.xml b/res/layout-port/search_bar.xml index 62bdb22fc..1e12e9eb8 100644 --- a/res/layout-port/search_bar.xml +++ b/res/layout-port/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" @@ -44,10 +44,10 @@ android:scaleType="fitStart" 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" @@ -69,5 +69,5 @@ android:scaleType="fitEnd" 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-port/workspace_cling.xml b/res/layout-port/workspace_cling.xml index ca71a3b44..052e1a091 100644 --- a/res/layout-port/workspace_cling.xml +++ b/res/layout-port/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> diff --git a/res/layout-sw600dp-port/all_apps_cling.xml b/res/layout-sw600dp-port/all_apps_cling.xml index fc32c4a89..cf65e410d 100644 --- a/res/layout-sw600dp-port/all_apps_cling.xml +++ b/res/layout-sw600dp-port/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_portrait"> <FrameLayout android:layout_width="match_parent" @@ -47,4 +47,4 @@ android:layout_marginEnd="36dp" android:layout_gravity="top|end" android:onClick="dismissAllAppsCling" /> -</com.android.launcher2.Cling> +</com.android.launcher3.Cling> diff --git a/res/layout-sw600dp-port/folder_cling.xml b/res/layout-sw600dp-port/folder_cling.xml index 356bae55c..87086cb62 100644 --- a/res/layout-sw600dp-port/folder_cling.xml +++ b/res/layout-sw600dp-port/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_portrait"> <FrameLayout android:layout_width="match_parent" @@ -48,4 +48,4 @@ android:layout_marginEnd="36dp" android:layout_gravity="bottom|end" android:onClick="dismissFolderCling" /> -</com.android.launcher2.Cling> +</com.android.launcher3.Cling> diff --git a/res/layout-sw720dp-port/folder_cling.xml b/res/layout-sw720dp-port/folder_cling.xml index d4d66dc74..40d4e20a5 100644 --- a/res/layout-sw720dp-port/folder_cling.xml +++ b/res/layout-sw720dp-port/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/all_apps_cling.xml b/res/layout-sw720dp/all_apps_cling.xml index d6e19d302..824d84f0d 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 f66da7bc7..4193838ca 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 a8faf3665..f69f68d95 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 2bacf362d..d798aff92 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 7cf79b8b5..44c969bef 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 9461e3b55..f3c32173f 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 bf2abfdb4..00ed529e0 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 ca71a3b44..052e1a091 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> diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml index a9d7deded..a67cf919a 100644 --- a/res/layout/apps_customize_pane.xml +++ b/res/layout/apps_customize_pane.xml @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.launcher2.AppsCustomizeTabHost +<com.android.launcher3.AppsCustomizeTabHost 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:background="#FF000000"> <LinearLayout android:id="@+id/apps_customize_content" @@ -31,7 +31,7 @@ android:layout_height="@dimen/apps_customize_tab_bar_height" android:layout_marginTop="@dimen/apps_customize_tab_bar_margin_top" android:layout_gravity="center_horizontal"> - <com.android.launcher2.FocusOnlyTabWidget + <com.android.launcher3.FocusOnlyTabWidget android:id="@android:id/tabs" android:layout_width="match_parent" android:layout_height="match_parent" @@ -51,7 +51,7 @@ android:id="@android:id/tabcontent" android:layout_width="match_parent" android:layout_height="match_parent"> - <com.android.launcher2.AppsCustomizePagedView + <com.android.launcher3.AppsCustomizePagedView android:id="@+id/apps_customize_pane_content" android:layout_width="match_parent" android:layout_height="match_parent" @@ -91,4 +91,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" /> -</com.android.launcher2.AppsCustomizeTabHost> +</com.android.launcher3.AppsCustomizeTabHost> diff --git a/res/layout/apps_customize_widget.xml b/res/layout/apps_customize_widget.xml index 6bb794345..ad677e928 100644 --- a/res/layout/apps_customize_widget.xml +++ b/res/layout/apps_customize_widget.xml @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.launcher2.PagedViewWidget +<com.android.launcher3.PagedViewWidget 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" @@ -26,7 +26,7 @@ android:focusable="true"> <!-- The preview of the widget or shortcut. --> - <com.android.launcher2.PagedViewWidgetImageView + <com.android.launcher3.PagedViewWidgetImageView android:id="@+id/widget_preview" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -75,4 +75,4 @@ </LinearLayout> -</com.android.launcher2.PagedViewWidget> +</com.android.launcher3.PagedViewWidget> diff --git a/res/layout/custom_workspace_cling.xml b/res/layout/custom_workspace_cling.xml index b3e15f589..3744f2e4b 100644 --- a/res/layout/custom_workspace_cling.xml +++ b/res/layout/custom_workspace_cling.xml @@ -14,9 +14,9 @@ limitations under the License. --> <!-- dummy layout, to be replaced in overlays --> -<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_custom"> @@ -29,4 +29,4 @@ android:gravity="start" android:layout_gravity="bottom|start" /> -</com.android.launcher2.Cling> +</com.android.launcher3.Cling> diff --git a/res/layout/drop_target_bar.xml b/res/layout/drop_target_bar.xml index ca3f55404..f38a50014 100644 --- a/res/layout/drop_target_bar.xml +++ b/res/layout/drop_target_bar.xml @@ -19,7 +19,7 @@ style="@style/DropTargetButtonContainer" android:layout_weight="1"> <!-- Delete target --> - <com.android.launcher2.DeleteDropTarget + <com.android.launcher3.DeleteDropTarget style="@style/DropTargetButton" android:id="@+id/delete_target_text" android:text="@string/delete_zone_label_workspace" @@ -30,10 +30,10 @@ style="@style/DropTargetButtonContainer" android:layout_weight="1"> <!-- Info target --> - <com.android.launcher2.InfoDropTarget + <com.android.launcher3.InfoDropTarget style="@style/DropTargetButton" android:id="@+id/info_target_text" android:text="@string/info_target_label" android:drawableStart="@drawable/info_target_selector" /> </FrameLayout> -</merge>
\ No newline at end of file +</merge> diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml index 322dc006f..56e052346 100644 --- a/res/layout/qsb_bar.xml +++ b/res/layout/qsb_bar.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.launcher2.SearchDropTargetBar +<com.android.launcher3.SearchDropTargetBar xmlns:android="http://schemas.android.com/apk/res/android" style="@style/QSBBar" android:focusable="false"> @@ -30,4 +30,4 @@ <include layout="@layout/drop_target_bar" /> </LinearLayout> -</com.android.launcher2.SearchDropTargetBar> +</com.android.launcher3.SearchDropTargetBar> diff --git a/res/layout/tab_widget_indicator.xml b/res/layout/tab_widget_indicator.xml index df43d3ddd..de7c50ec4 100644 --- a/res/layout/tab_widget_indicator.xml +++ b/res/layout/tab_widget_indicator.xml @@ -14,6 +14,6 @@ limitations under the License. --> -<com.android.launcher2.AccessibleTabView +<com.android.launcher3.AccessibleTabView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/TabIndicator.AppsCustomize" /> diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml index aa4eb1c9c..8c72dd673 100644 --- a/res/layout/user_folder.xml +++ b/res/layout/user_folder.xml @@ -14,15 +14,15 @@ limitations under the License. --> -<com.android.launcher2.Folder +<com.android.launcher3.Folder 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="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" android:background="@drawable/portal_container_holo"> - <com.android.launcher2.CellLayout + <com.android.launcher3.CellLayout android:id="@+id/folder_content" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -37,7 +37,7 @@ launcher:cellWidth="@dimen/folder_cell_width" launcher:cellHeight="@dimen/folder_cell_height" /> - <com.android.launcher2.FolderEditText + <com.android.launcher3.FolderEditText android:id="@+id/folder_name" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -52,4 +52,4 @@ android:gravity="center_horizontal" android:singleLine="true" android:imeOptions="flagNoExtractUi"/> -</com.android.launcher2.Folder> +</com.android.launcher3.Folder> diff --git a/res/layout/wallpaper_chooser_base.xml b/res/layout/wallpaper_chooser_base.xml index fa8ea9372..14906674e 100644 --- a/res/layout/wallpaper_chooser_base.xml +++ b/res/layout/wallpaper_chooser_base.xml @@ -21,7 +21,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> - <fragment class="com.android.launcher2.WallpaperChooserDialogFragment" + <fragment class="com.android.launcher3.WallpaperChooserDialogFragment" android:id="@+id/wallpaper_chooser_fragment" android:layout_width="match_parent" android:layout_height="match_parent" /> diff --git a/res/layout/workspace_screen.xml b/res/layout/workspace_screen.xml index 6538532c1..acc9f6651 100644 --- a/res/layout/workspace_screen.xml +++ b/res/layout/workspace_screen.xml @@ -14,9 +14,9 @@ limitations under the License. --> -<com.android.launcher2.CellLayout +<com.android.launcher3.CellLayout 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="wrap_content" android:layout_height="wrap_content" @@ -30,4 +30,4 @@ launcher:cellHeight="@dimen/workspace_cell_height" launcher:widthGap="@dimen/workspace_width_gap" launcher:heightGap="@dimen/workspace_height_gap" - launcher:maxGap="@dimen/workspace_max_gap" />
\ No newline at end of file + launcher:maxGap="@dimen/workspace_max_gap" /> diff --git a/res/mipmap-hdpi/ic_launcher_home.png b/res/mipmap-hdpi/ic_launcher_home.png Binary files differindex 8945ada34..b556d7aba 100644 --- a/res/mipmap-hdpi/ic_launcher_home.png +++ b/res/mipmap-hdpi/ic_launcher_home.png diff --git a/res/mipmap-mdpi/ic_launcher_home.png b/res/mipmap-mdpi/ic_launcher_home.png Binary files differindex 72bd80a2f..961bb7dbd 100644 --- a/res/mipmap-mdpi/ic_launcher_home.png +++ b/res/mipmap-mdpi/ic_launcher_home.png diff --git a/res/mipmap-xhdpi/ic_launcher_home.png b/res/mipmap-xhdpi/ic_launcher_home.png Binary files differindex 7bef13ca7..46ec2b775 100644 --- a/res/mipmap-xhdpi/ic_launcher_home.png +++ b/res/mipmap-xhdpi/ic_launcher_home.png diff --git a/res/mipmap-xxhdpi/ic_launcher_home.png b/res/mipmap-xxhdpi/ic_launcher_home.png Binary files differnew file mode 100644 index 000000000..d2975a39f --- /dev/null +++ b/res/mipmap-xxhdpi/ic_launcher_home.png diff --git a/res/values-sw720dp/wallpapers.xml b/res/values-sw720dp/wallpapers.xml index 8b01477e4..1e340e4b2 100644 --- a/res/values-sw720dp/wallpapers.xml +++ b/res/values-sw720dp/wallpapers.xml @@ -17,16 +17,5 @@ <resources> <string-array name="wallpapers" translatable="false"> - <item>wallpaper_00</item> - <item>wallpaper_01</item> - <item>wallpaper_02</item> - <item>wallpaper_03</item> - <item>wallpaper_04</item> - <item>wallpaper_05</item> - <item>wallpaper_06</item> - <item>wallpaper_07</item> - <item>wallpaper_08</item> - <item>wallpaper_09</item> - <item>wallpaper_10</item> </string-array> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index ead582ef5..102e43e77 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -21,7 +21,7 @@ <!-- General --> <skip /> <!-- Application name --> - <string name="application_name">Launcher</string> + <string name="application_name">Launcher3</string> <!-- Accessibility-facing application name --> <string name="home">Home</string> <!-- Name for all applications running as this uid. --> diff --git a/res/values/wallpapers.xml b/res/values/wallpapers.xml index ed56b18ff..1e340e4b2 100644 --- a/res/values/wallpapers.xml +++ b/res/values/wallpapers.xml @@ -17,17 +17,5 @@ <resources> <string-array name="wallpapers" translatable="false"> - <item>wallpaper_01</item> - <item>wallpaper_02</item> - <item>wallpaper_03</item> - <item>wallpaper_04</item> - <item>wallpaper_05</item> - <item>wallpaper_06</item> - <item>wallpaper_07</item> - <item>wallpaper_08</item> - <item>wallpaper_09</item> - <item>wallpaper_10</item> - <item>wallpaper_11</item> - <item>wallpaper_12</item> </string-array> </resources> diff --git a/res/xml-sw600dp/default_workspace.xml b/res/xml-sw600dp/default_workspace.xml index 05371696d..090c7a7af 100644 --- a/res/xml-sw600dp/default_workspace.xml +++ b/res/xml-sw600dp/default_workspace.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"> +<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"> <!-- Far-left screen [0] --> <!-- Left screen [1] --> diff --git a/res/xml-sw720dp/default_workspace.xml b/res/xml-sw720dp/default_workspace.xml index 6302d7e04..1c1d70e92 100644 --- a/res/xml-sw720dp/default_workspace.xml +++ b/res/xml-sw720dp/default_workspace.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"> +<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"> <!-- Far-left screen [0] --> <!-- Left screen [1] --> diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml index 93338d3b7..26fc504f0 100644 --- a/res/xml/default_workspace.xml +++ b/res/xml/default_workspace.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"> +<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"> <!-- Far-left screen [0] --> <!-- Left screen [1] --> diff --git a/res/xml/update_workspace.xml b/res/xml/update_workspace.xml index ba35b151f..38442b91c 100644 --- a/res/xml/update_workspace.xml +++ b/res/xml/update_workspace.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"> +<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"> <!-- Update the db with new hotseat items. Note that we reference the browser's original package name. --> <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> diff --git a/res/xml/wallpaper_picker_preview.xml b/res/xml/wallpaper_picker_preview.xml index d52e0e03f..ce7124cef 100644 --- a/res/xml/wallpaper_picker_preview.xml +++ b/res/xml/wallpaper_picker_preview.xml @@ -17,4 +17,4 @@ <wallpaper-preview xmlns:android="http://schemas.android.com/apk/res/android" android:staticWallpaperPreview="@drawable/wallpaper_picker_preview"> -</wallpaper-preview>
\ No newline at end of file +</wallpaper-preview> |