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

Commit 0ebdabef authored by Chirayu Desai's avatar Chirayu Desai Committed by Bruno Martins
Browse files

Update for Q setup library changes 

setupwizardlib,setupnavigationbar -> setupcompat,setupdesign

Change-Id: I8bf75028984dbf9fc2341990e93bd15ca0ad2af8
parent dc496378

Android.mk

+3 −4
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ LOCAL_PRIVATE_PLATFORM_APIS := true 
LOCAL_PROGUARD_FLAG_FILES := proguard.flags



LOCAL_STATIC_ANDROID_LIBRARIES := \

    androidx.core_core

    androidx.core_core \

    setupcompat \

    setupdesign



LOCAL_STATIC_JAVA_LIBRARIES := \

    libphonenumber \
@@ -28,9 +30,6 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res 


LOCAL_USE_AAPT2 := true



include frameworks/opt/setupwizard/navigationbar/common.mk

include frameworks/opt/setupwizard/library/common-gingerbread.mk



include $(BUILD_PACKAGE)



include $(call all-makefiles-under,$(LOCAL_PATH))

res/layout/choose_data_sim_page.xml

+6 −2
Original line number Diff line number Diff line
@@ -64,7 +64,11 @@ 
            android:layout_gravity="top"

            android:visibility="gone"/>

    </FrameLayout>

    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"



    <com.google.android.setupdesign.view.NavigationBar

        android:id="@+id/navigation_bar"

        style="@style/setup_wizard_navbar_style" />

        style="@style/SudNavBarTheme"

        android:layout_width="match_parent"

        android:layout_height="@dimen/sud_navbar_height" />



</LinearLayout>

res/layout/finish_activity.xml

+5 −4
Original line number Diff line number Diff line
@@ -42,10 +42,11 @@ 
            android:gravity="center"

            android:padding="@dimen/content_margin_left"/>





        <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"

        <com.google.android.setupdesign.view.NavigationBar

            android:id="@+id/navigation_bar"

                  style="@style/setup_wizard_navbar_style" />

            style="@style/SudNavBarTheme"

            android:layout_width="match_parent"

            android:layout_height="@dimen/sud_navbar_height" />



    </LinearLayout>

res/layout/location_settings.xml

+6 −2
Original line number Diff line number Diff line
@@ -156,7 +156,11 @@ 
            </LinearLayout>

        </ScrollView>

    </FrameLayout>

    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"



    <com.google.android.setupdesign.view.NavigationBar

        android:id="@+id/navigation_bar"

        style="@style/setup_wizard_navbar_style" />

        style="@style/SudNavBarTheme"

        android:layout_width="match_parent"

        android:layout_height="@dimen/sud_navbar_height" />



</LinearLayout>

res/layout/mobile_data_settings.xml

+6 −2
Original line number Diff line number Diff line
@@ -103,7 +103,11 @@ 
            </LinearLayout>

        </ScrollView>

    </FrameLayout>

    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"



    <com.google.android.setupdesign.view.NavigationBar

        android:id="@+id/navigation_bar"

        style="@style/setup_wizard_navbar_style" />

        style="@style/SudNavBarTheme"

        android:layout_width="match_parent"

        android:layout_height="@dimen/sud_navbar_height" />



</LinearLayout>