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

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

Merge "FloatingToolbar with overflow. -Implemented the toolbar overflow... 

Merge "FloatingToolbar with overflow. -Implemented the toolbar overflow -Refactored a bit to make the concepts clear and component easier to understand and maintain -Floating toolbar now uses a clipped popup window that allows touch events to go through the transparent parts"
parents a1b19b7b 517adad1

core/java/com/android/internal/widget/FloatingToolbar.java

+788 −257

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/layout/floating_popup_close_overflow_button.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

/* 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.

*/

-->

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

    android:layout_width="@dimen/floating_toolbar_menu_button_minimum_width"

    android:layout_height="match_parent"

    android:minWidth="@dimen/floating_toolbar_menu_button_minimum_width"

    android:minHeight="@dimen/floating_toolbar_height"

    android:src="?android:attr/actionModeCloseDrawable"

    android:contentDescription="@string/floating_toolbar_close_overflow_description"

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

core/res/res/layout/floating_popup_open_overflow_button.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@ 
    android:minWidth="@dimen/floating_toolbar_menu_button_minimum_width"

    android:minHeight="@dimen/floating_toolbar_height"

    android:src="@drawable/ic_menu_moreoverflow_material"

    android:contentDescription="@string/action_menu_overflow_description"

    android:contentDescription="@string/floating_toolbar_open_overflow_description"

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

core/res/res/layout/floating_popup_overflow_list_item

0 → 100644
+33 −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.

*/

-->

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:textAppearance="?android:attr/textAppearanceListItemSmall"

    android:gravity="center_vertical"

    android:minWidth="@dimen/floating_toolbar_menu_button_side_padding"

    android:minHeight="@dimen/floating_toolbar_height"

    android:paddingLeft="@dimen/floating_toolbar_menu_button_side_padding"

    android:paddingRight="@dimen/floating_toolbar_menu_button_side_padding"

    android:paddingTop="0dp"

    android:paddingBottom="0dp"

    android:singleLine="true"

    android:ellipsize="end"

    android:fontFamily="sans-serif"

    android:textSize="@dimen/floating_toolbar_text_size"

    android:textAllCaps="true" />

core/res/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -392,4 +392,6 @@ 
     <dimen name="floating_toolbar_menu_button_minimum_width">48dp</dimen>

     <dimen name="floating_toolbar_default_width">250dp</dimen>

     <dimen name="floating_toolbar_minimum_overflow_height">192dp</dimen>

     <dimen name="floating_toolbar_overflow_width">130dp</dimen>

     <dimen name="floating_toolbar_margin">2dp</dimen>

</resources>