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

Commit 303f694a authored by Pasty Chang's avatar Pasty Chang Committed by Android (Google) Code Review
Browse files

Merge "Migrating to new footer button for storage migrated pages"

parents ca9e3ca8 28fd9b10

res/layout/storage_wizard_footer.xml

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

<!--

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

    style="@style/SuwGlifButtonBar"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



    <Button

        android:id="@+id/storage_back_button"

        style="@style/SuwGlifButton.Secondary"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:onClick="onNavigateBack"

        android:visibility="gone"

        android:text="@string/wizard_back" />



    <Space

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_weight="1" />



    <Button

        android:id="@+id/storage_next_button"

        style="@style/SuwGlifButton.Primary"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:onClick="onNavigateNext"

        android:visibility="gone"

        android:text="@string/wizard_next" />



</LinearLayout>

res/layout/storage_wizard_generic.xml

+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    app:sucFooter="@layout/storage_wizard_footer">

    android:layout_height="match_parent">



    <LinearLayout

        style="@style/SuwContentFrame"

res/layout/storage_wizard_init.xml

+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    app:sucFooter="@layout/storage_wizard_footer">

    android:layout_height="match_parent">



    <LinearLayout

        style="@style/SuwContentFrame"

res/layout/storage_wizard_navigation.xml

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
<?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.

-->



<LinearLayout

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

    android:id="@+id/suw_layout_navigation_bar"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="horizontal">



    <Button

        android:id="@+id/suw_navbar_back"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:visibility="gone" />



    <View

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_weight="1" />



    <Button

        android:id="@+id/suw_navbar_more"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:visibility="gone" />



    <Button

        android:id="@+id/suw_navbar_next"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="16dp"

        android:layout_marginBottom="16dp"

        android:layout_marginEnd="16dp"

        android:text="@string/wizard_next"

        android:textColor="@android:color/white"

        android:backgroundTint="@color/storage_wizard_button" />



</LinearLayout>

res/layout/storage_wizard_progress.xml

+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    app:sucFooter="@layout/storage_wizard_footer">

    android:layout_height="match_parent">



    <LinearLayout

        style="@style/SuwContentFrame"