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

Unverified Commit 461c46f4 authored by Danny Baumann's avatar Danny Baumann Committed by Michael Bestas
Browse files

De-holoize contact group activity. 

Also fix some additional obvious action bar related glitches in the
group UI.

Change-Id: If73d2155a7419acb1bca6a7653a31f97c6591974
parent d8bb5749

res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
    <color name="action_bar_background">#0288d1</color>

    <color name="action_bar_background_highlight">#cecece</color>

    <color name="action_bar_button_text_color">#FFFFFF</color>

    <color name="actionbar_sub_text_color">#b3ffffff</color>



    <color name="actionbar_background_color">@color/primary_color</color>

    <color name="actionbar_background_color_dark">@color/primary_color_dark</color>

res/values/styles.xml

+9 −13
Original line number Diff line number Diff line
@@ -15,20 +15,14 @@ 
-->

<resources>



    <style name="DetailActivityTheme" parent="@android:style/Theme.Holo.Light">

        <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>

        <item name="android:homeAsUpIndicator">@drawable/ic_menu_back</item>

        <item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflow</item>

        <item name="android:actionBarItemBackground">@drawable/action_bar_item_background</item>

    <style name="DetailActivityTheme" parent="@style/PeopleTheme">

        <item name="android:actionBarItemBackground">@drawable/item_background_material_borderless_dark</item>

        <item name="android:actionBarWidgetTheme">@style/ContactsActionBarTheme</item>

        <item name="android:textColorPrimary">@color/primary_text_color</item>

        <item name="android:textColorSecondary">@color/secondary_text_color</item>

        <item name="android:listViewStyle">@style/ListViewStyle</item>

    </style>



    <style name="EditorActivityTheme" parent="@style/PeopleTheme">

        <item name="android:listViewStyle">@style/ListViewStyle</item>

        <item name="android:actionBarStyle">@style/EditorActionBarStyle</item>

        <item name="android:colorButtonNormal">@color/background_primary</item>

    </style>
@@ -117,15 +111,12 @@ 
    <style name="ContactsActionBarStyle" parent="@android:style/Widget.Material.ActionBar">

        <item name="android:background">@color/actionbar_background_color</item>

        <item name="android:titleTextStyle">@style/ContactsActionBarTitleText</item>

        <item name="android:subtitleTextStyle">@style/ContactsActionBarSubTitleText</item>

        <item name="android:backgroundStacked">@color/actionbar_background_color</item>

        <!-- Empty icon -->

        <item name="android:icon">@android:color/transparent</item>

    </style>



    <style name="EditorActionBarStyle" parent="@style/ContactsActionBarStyle">

        <item name="android:contentInsetStart">72dp</item>

    </style>



    <!-- When this style was added, android:toolbarStyle was private. Therefore, this style

         must be directly applied to every toolbar -->

    <style name="ContactsToolbarStyle" parent="@android:style/Widget.Toolbar">
@@ -150,6 +141,11 @@ 
        <item name="android:textColor">@color/actionbar_text_color</item>

    </style>



    <style name="ContactsActionBarSubTitleText"

           parent="@android:style/TextAppearance.Material.Widget.ActionBar.Subtitle">

        <item name="android:textColor">@color/actionbar_sub_text_color</item>

    </style>



    <!-- Styling for the tab bar; handles styling of the divider line. -->

    <style name="ContactsActionBarTabBarStyle"

           parent="@android:style/Widget.Material.ActionBar.TabBar">
@@ -177,7 +173,7 @@ 
        <item name="android:background">@drawable/ab_dropdown_navigation_item_background</item>

    </style>



    <style name="ContactsActionBarTheme" parent="@android:style/Theme.Holo.Light">

    <style name="ContactsActionBarTheme" parent="@android:style/Theme.Material.Light">

        <item name="android:textColorHint">#CCCCCC</item>

        <item name="android:textColor">@android:color/black</item>

        <item name="android:popupMenuStyle">@android:style/Widget.Holo.Light.PopupMenu</item>

src/com/android/contacts/activities/MultiPickContactsActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -356,6 +356,7 @@ public class MultiPickContactsActivity extends Activity implements ViewPager.OnP 
        mActionBar = getActionBar();

        mActionBar.setDisplayShowHomeEnabled(true);

        mActionBar.setDisplayHomeAsUpEnabled(true);

        mActionBar.setLogo(null);

        mActionBar.setTitle(null);



        mPickMode = ContactsPickMode.getInstance();
@@ -393,14 +394,12 @@ public class MultiPickContactsActivity extends Activity implements ViewPager.OnP 
        initResource();



        if (mPickMode.isPickPhone()) {

            mActionBar.setElevation(0);

            mSearchFragment = new SearchFragment();

            mSearchFragment.setCheckListListener(new CheckListListener());

            FragmentTransaction mFragmentTransaction = fragmentManager.beginTransaction();

            mFragmentTransaction.add(R.id.search_layout, mSearchFragment);

            mFragmentTransaction.commit();

        } else {

            mActionBar.setElevation(4 * getResources().getDisplayMetrics().density);

            mViewPagerTabs.setVisibility(View.GONE);

        }

    }

src/com/android/contacts/group/GroupEditorFragment.java

+1 −0
Original line number Diff line number Diff line
@@ -1069,6 +1069,7 @@ public class GroupEditorFragment extends Fragment implements SelectAccountDialog 


            QuickContactBadge badge = (QuickContactBadge) result.findViewById(R.id.badge);

            badge.assignContactUri(member.getLookupUri());

            badge.setOverlay(null);



            TextView name = (TextView) result.findViewById(R.id.name);

            name.setText(member.getDisplayName());