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

Commit 87e949c4 authored by Abodunrinwa Toki's avatar Abodunrinwa Toki Committed by Android (Google) Code Review
Browse files

Merge "More FloatingToolbar styles." into mnc-dev

parents 5c56f745 925843d5

core/res/res/drawable/floating_popup_background.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* Copyright 2015, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->

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

    android:shape="rectangle">

    <solid android:color="?attr/colorBackgroundFloating" />

    <corners android:radius="2dp" />

</shape>

core/res/res/layout/floating_popup_close_overflow_button.xml

+1 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* Copyright 2015, The Android Open Source Project

**

core/res/res/layout/floating_popup_container.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,4 +24,4 @@ 
    android:elevation="2dp"

    android:focusable="true"

    android:focusableInTouchMode="true"

    android:background="?attr/colorBackgroundFloating"/>
 
    android:background="@drawable/floating_popup_background"/>

core/res/res/layout/floating_popup_menu_button.xml

+2 −1
Original line number Diff line number Diff line
@@ -24,9 +24,10 @@ 
    android:paddingTop="0dp"

    android:paddingBottom="0dp"

    android:layout_margin="0dp"

    android:gravity="center"

    android:singleLine="true"

    android:ellipsize="end"

    android:fontFamily="sans-serif"

    android:fontFamily="sans-serif-medium"

    android:textSize="@dimen/floating_toolbar_text_size"

    android:textAllCaps="true"

    android:textColor="?attr/colorForeground"

core/res/res/layout/floating_popup_menu_image_button.xml

+8 −4
Original line number Diff line number Diff line
@@ -16,17 +16,21 @@ 
*/

-->

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

    android:layout_width="@dimen/floating_toolbar_menu_button_minimum_width"

    android:layout_height="@dimen/floating_toolbar_height"

    android:minWidth="@dimen/floating_toolbar_menu_button_minimum_width"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:minWidth="@dimen/floating_toolbar_menu_image_button_width"

    android:minHeight="@dimen/floating_toolbar_height"

    android:focusable="false"

    android:focusableInTouchMode="false"

    android:importantForAccessibility="no">

    <ImageButton

        android:id="@+id/floating_toolbar_menu_item_image_button"

        android:layout_width="@dimen/floating_toolbar_menu_button_minimum_width"

        android:layout_width="@dimen/floating_toolbar_menu_image_button_width"

        android:layout_height="@dimen/floating_toolbar_height"

        android:paddingStart="@dimen/floating_toolbar_menu_button_side_padding"

        android:paddingTop="@dimen/floating_toolbar_menu_image_button_vertical_padding"

        android:paddingEnd="@dimen/floating_toolbar_menu_button_side_padding"

        android:paddingBottom="@dimen/floating_toolbar_menu_image_button_vertical_padding"

        android:scaleType="centerInside"

        android:background="?attr/selectableItemBackground" />

</LinearLayout>