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

Commit 27356bd8 authored by Wenyi Wang's avatar Wenyi Wang Committed by android-build-merger
Browse files

Use AppCompatContactsActivity as super class of activities (1/3) 

am: e7fd1ad1

* commit 'e7fd1ad1':
  Use AppCompatContactsActivity as super class of activities (1/3)
parents 9361d904 e7fd1ad1

AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,7 @@ 
        <!-- The main Contacts activity with the contact list, favorites, and groups. -->

        <!-- The main Contacts activity with the contact list, favorites, and groups. -->

        <activity android:name=".activities.PeopleActivity"

        <activity android:name=".activities.PeopleActivity"

            android:label="@string/launcherActivityLabel"

            android:label="@string/launcherActivityLabel"

            android:theme="@style/PeopleTheme"

            android:theme="@style/PeopleActivityTheme"

            android:clearTaskOnLaunch="true"

            android:clearTaskOnLaunch="true"

            android:launchMode="singleTop"

            android:launchMode="singleTop"

            android:resizeableActivity="true"

            android:resizeableActivity="true"

res/layout-land/contacts_unavailable_fragment_content.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -69,6 +69,7 @@ 
            android:layout_gravity="center_horizontal">

            android:layout_gravity="center_horizontal">





            <Button

            <Button

                style="@style/ContactsUnavailableButtonStyle"

                android:id="@+id/add_account_button"

                android:id="@+id/add_account_button"

                android:layout_width="match_parent"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"
@@ -78,6 +79,7 @@ 
                android:text="@string/contacts_unavailable_add_account" />

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





            <Button

            <Button

                style="@style/ContactsUnavailableButtonStyle"

                android:id="@+id/import_contacts_button"

                android:id="@+id/import_contacts_button"

                android:layout_width="match_parent"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

res/layout-land/people_activity_toolbar.xml

+5 −3
Original line number Original line Diff line number Diff line
@@ -28,13 +28,15 @@ 
    <FrameLayout

    <FrameLayout

        android:id="@+id/toolbar_frame"

        android:id="@+id/toolbar_frame"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="?android:attr/actionBarSize"

        android:layout_height="?attr/actionBarSize"

        android:background="@color/actionbar_background_color">

        android:background="@color/actionbar_background_color">





        <Toolbar

        <!-- the attribute padding removes the gap between this Toolbar and its parent FrameLayout on tablet -->

        <android.support.v7.widget.Toolbar

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="?android:attr/actionBarSize"

            android:layout_height="?attr/actionBarSize"

            android:id="@+id/toolbar"

            android:id="@+id/toolbar"

            android:padding="0dp"

            style="@style/ContactsToolbarStyle" />

            style="@style/ContactsToolbarStyle" />





    </FrameLayout>

    </FrameLayout>

res/layout/contacts_unavailable_fragment_content.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -58,6 +58,7 @@ 
        android:layout_height="wrap_content">

        android:layout_height="wrap_content">





        <Button

        <Button

            style="@style/ContactsUnavailableButtonStyle"

            android:id="@+id/add_account_button"

            android:id="@+id/add_account_button"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"
@@ -67,6 +68,7 @@ 
            android:text="@string/contacts_unavailable_add_account" />

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





        <Button

        <Button

            style="@style/ContactsUnavailableButtonStyle"

            android:id="@+id/import_contacts_button"

            android:id="@+id/import_contacts_button"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

res/layout/custom_action_bar.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ 
        android:layout_height="1px" >

        android:layout_height="1px" >

        <requestFocus />

        <requestFocus />

    </View>

    </View>

    <SearchView

    <android.support.v7.widget.SearchView

        android:id="@+id/search_view"

        android:id="@+id/search_view"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="match_parent"