Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b765b182 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Removing logic for workspace migration from Launcher2" into ub-launcher3-calgary

parents 72f9161b ded0fdba

res/drawable-nodpi/ic_migration.png

deleted100644 → 0
−71.9 KiB
Loading image diff...

res/drawable/bg_migration_cling.xml

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="oval" >



    <gradient

        android:endColor="#00ffeb3a"

        android:gradientRadius="50%p"

        android:startColor="#80ffeb3a"

        android:type="radial" />



</shape>
 
 No newline at end of file

res/layout-land/migration_cling.xml

deleted100644 → 0
+0 −106
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2011 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.

-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    android:id="@+id/migration_cling"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    launcher:layout_ignoreInsets="true"

    android:background="#FF009688"

    android:baselineAligned="false"

    android:gravity="center_vertical" >



    <FrameLayout

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1" >



        <ImageView

            android:layout_width="@dimen/cling_migration_bg_size"

            android:layout_height="@dimen/cling_migration_bg_size"

            android:layout_gravity="center"

            android:background="@drawable/bg_migration_cling" />



        <ImageView

            android:layout_width="@dimen/cling_migration_logo_width"

            android:layout_height="@dimen/cling_migration_logo_height"

            android:layout_gravity="center"

            android:src="@drawable/ic_migration" />

    </FrameLayout>



    <LinearLayout

        android:layout_width="@dimen/cling_migration_content_width"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/cling_migration_content_margin"

        android:layout_marginRight="@dimen/cling_migration_content_margin"

        android:orientation="vertical"

        android:paddingLeft="24dp"

        android:paddingRight="24dp" >



        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingBottom="8dp"

            android:text="@string/first_run_cling_title"

            android:textColor="#E1000000"

            android:textSize="34sp" />



        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:fontFamily="sans-serif-medium"

            android:text="@string/migration_cling_title"

            android:textColor="#E1000000"

            android:textSize="20sp" />



        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingBottom="24dp"

            android:text="@string/migration_cling_description"

            android:textColor="#99000000"

            android:textSize="16sp" />



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content" >



            <Button

                android:id="@+id/cling_dismiss_migration_copy_apps"

                style="?android:attr/buttonBarButtonStyle"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:fontFamily="sans-serif-medium"

                android:text="@string/migration_cling_copy_apps"

                android:textColor="#FFFFFFFF"

                android:textSize="14sp" />



            <Button

                android:id="@+id/cling_dismiss_migration_use_default"

                style="?android:attr/buttonBarButtonStyle"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:fontFamily="sans-serif-medium"

                android:text="@string/migration_cling_use_default"

                android:textColor="#deFFFFFF"

                android:textSize="14sp" />

        </LinearLayout>

    </LinearLayout>



</LinearLayout>
 
 No newline at end of file

res/layout-port/migration_cling.xml

deleted100644 → 0
+0 −109
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2011 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"

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    android:id="@+id/migration_cling"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    launcher:layout_ignoreInsets="true"

    android:background="#FF009688" >



    <RelativeLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical" >



        <ImageView

            android:layout_width="@dimen/cling_migration_bg_size"

            android:layout_height="@dimen/cling_migration_bg_size"

            android:layout_below="@+id/ic_cling_migration"

            android:layout_centerHorizontal="true"

            android:layout_marginTop="@dimen/cling_migration_bg_shift"

            android:src="@drawable/bg_migration_cling" />



        <ImageView

            android:id="@+id/ic_cling_migration"

            android:layout_width="@dimen/cling_migration_logo_width"

            android:layout_height="@dimen/cling_migration_logo_height"

            android:layout_alignParentTop="true"

            android:layout_centerHorizontal="true"

            android:src="@drawable/ic_migration" />



        <LinearLayout

            android:layout_width="@dimen/cling_migration_content_width"

            android:layout_height="wrap_content"

            android:layout_below="@+id/ic_cling_migration"

            android:layout_marginStart="@dimen/cling_migration_content_margin"

            android:layout_marginLeft="@dimen/cling_migration_content_margin"

            android:orientation="vertical"

            android:paddingLeft="24dp"

            android:paddingRight="24dp" >



            <TextView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:paddingBottom="8dp"

                android:text="@string/first_run_cling_title"

                android:textColor="#E1000000"

                android:textSize="34sp" />



            <TextView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:fontFamily="sans-serif-medium"

                android:text="@string/migration_cling_title"

                android:textColor="#E1000000"

                android:textSize="20sp" />



            <TextView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:paddingBottom="24dp"

                android:text="@string/migration_cling_description"

                android:textColor="#99000000"

                android:textSize="16sp" />



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content" >



                <Button

                    android:id="@+id/cling_dismiss_migration_copy_apps"

                    style="?android:attr/buttonBarButtonStyle"

                    android:layout_width="0dp"

                    android:layout_height="wrap_content"

                    android:layout_weight="1"

                    android:fontFamily="sans-serif-medium"

                    android:text="@string/migration_cling_copy_apps"

                    android:textColor="#FFFFFFFF"

                    android:textSize="14sp" />



                <Button

                    android:id="@+id/cling_dismiss_migration_use_default"

                    style="?android:attr/buttonBarButtonStyle"

                    android:layout_width="0dp"

                    android:layout_height="wrap_content"

                    android:layout_weight="1"

                    android:fontFamily="sans-serif-medium"

                    android:text="@string/migration_cling_use_default"

                    android:textColor="#deFFFFFF"

                    android:textSize="14sp" />

            </LinearLayout>

        </LinearLayout>

    </RelativeLayout>



</FrameLayout>
 
 No newline at end of file

res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ 
    <!-- General -->

    <skip />



    <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->

    <string name="old_launcher_provider_uri" translatable="false">content://com.android.launcher2.settings/favorites?notify=true</string>



    <!-- Application name -->

    <string name="app_name">Launcher3</string>

    <!-- Default folder name -->