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

Commit e7fd1ad1 authored by Wenyi Wang's avatar Wenyi Wang
Browse files

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

- AppCompatContactsActivity will replace ContactsActivity eventually

- modified PeopleActivity and ContactSelectionActivity

- fixed the color of buttons in contacts_unavailable_fragment_content on K

Bug: 25629359
Change-Id: I7312fb446c6affc070db1b44b74ed857afcf8f3a
parent 79b4ecb3
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@
        <!-- The main Contacts activity with the contact list, favorites, and groups. -->
        <activity android:name=".activities.PeopleActivity"
            android:label="@string/launcherActivityLabel"
            android:theme="@style/PeopleTheme"
            android:theme="@style/PeopleActivityTheme"
            android:clearTaskOnLaunch="true"
            android:launchMode="singleTop"
            android:resizeableActivity="true"
+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@
            android:layout_gravity="center_horizontal">

            <Button
                style="@style/ContactsUnavailableButtonStyle"
                android:id="@+id/add_account_button"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
@@ -78,6 +79,7 @@
                android:text="@string/contacts_unavailable_add_account" />

            <Button
                style="@style/ContactsUnavailableButtonStyle"
                android:id="@+id/import_contacts_button"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+5 −3
Original line number Diff line number Diff line
@@ -28,13 +28,15 @@
    <FrameLayout
        android:id="@+id/toolbar_frame"
        android:layout_width="match_parent"
        android:layout_height="?android:attr/actionBarSize"
        android:layout_height="?attr/actionBarSize"
        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_height="?android:attr/actionBarSize"
            android:layout_height="?attr/actionBarSize"
            android:id="@+id/toolbar"
            android:padding="0dp"
            style="@style/ContactsToolbarStyle" />

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

        <Button
            style="@style/ContactsUnavailableButtonStyle"
            android:id="@+id/add_account_button"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
@@ -67,6 +68,7 @@
            android:text="@string/contacts_unavailable_add_account" />

        <Button
            style="@style/ContactsUnavailableButtonStyle"
            android:id="@+id/import_contacts_button"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@
        android:layout_height="1px" >
        <requestFocus />
    </View>
    <SearchView
    <android.support.v7.widget.SearchView
        android:id="@+id/search_view"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
Loading