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

Commit 8a7f4009 authored by Brian Attwell's avatar Brian Attwell Committed by Android Git Automerger
Browse files

am 4a24965c: Merge "Use custom ViewOutlineProvider to enable shadows" into lmp-dev 

* commit '4a24965c':
  Use custom ViewOutlineProvider to enable shadows
parents 7b8b2244 4a24965c

res/layout/people_activity_toolbar.xml

+0 −4
Original line number Diff line number Diff line
@@ -14,14 +14,10 @@ 
     limitations under the License.

-->



<!-- Need to set a non null background on Toolbar in order for MenuItem ripples to be drawn on

     this view, instead of another. This will *not* cause an additional draw since the

     background is transparent.-->

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

    android:id="@+id/toolbar_parent"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:background="#00000000"

    android:elevation="@dimen/tab_elevation"

    android:layout_height="wrap_content" >

res/layout/quickcontact_activity.xml

+0 −3
Original line number Diff line number Diff line
@@ -35,12 +35,9 @@ 
            android:contentDescription="@string/quickcontact_transparent_view_description"

            android:id="@+id/transparent_view" />



        <!-- Needs a non null background for elevation to work on this View. This will *not*

             cause an additional draw since the background is transparent. -->

        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:background="#00000000"

            android:id="@+id/toolbar_parent">

            <include layout="@layout/quickcontact_header" />

        </FrameLayout>

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

+3 −0
Original line number Diff line number Diff line
@@ -359,6 +359,9 @@ public class PeopleActivity extends ContactsActivity implements 
                portraitViewPagerTabs, landscapeViewPagerTabs, toolbar);

        mActionBarAdapter.initialize(savedState, mRequest);



        // Add shadow under toolbar

        ViewUtil.addRectangularOutlineProvider(findViewById(R.id.toolbar_parent), getResources());



        // Configure action button

        final View floatingActionButtonContainer = findViewById(

                R.id.floating_action_button_container);

src/com/android/contacts/quickcontact/QuickContactActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ import com.android.contacts.common.model.dataitem.WebsiteDataItem; 
import com.android.contacts.common.util.DateUtils;

import com.android.contacts.common.util.MaterialColorMapUtils;

import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette;

import com.android.contacts.common.util.ViewUtil;

import com.android.contacts.detail.ContactDisplayUtils;

import com.android.contacts.interactions.CalendarInteractionsLoader;

import com.android.contacts.interactions.CallLogInteractionsLoader;
@@ -570,6 +571,9 @@ public class QuickContactActivity extends ContactsActivity { 
            });

        }



        // Allow a shadow to be shown under the toolbar.

        ViewUtil.addRectangularOutlineProvider(findViewById(R.id.toolbar_parent), getResources());



        final Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);

        setActionBar(toolbar);

        getActionBar().setTitle(null);