Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "More FloatingToolbar styles." into mnc-dev

Browse Source
This commit is contained in:
Abodunrinwa Toki
2015-06-03 16:54:36 +00:00
committed by Android (Google) Code Review
parent 5c56f74527 925843d535
commit 87e949c4b8
9 changed files with 54 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/res/res/drawable/floating_popup_background.xml Normal file
View File

@@ -0,0 +1,23 @@
<?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>

1
core/res/res/layout/floating_popup_close_overflow_button.xml
View File

@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* Copyright 2015, The Android Open Source Project
**

2
core/res/res/layout/floating_popup_container.xml
View File

@@ -24,4 +24,4 @@
android:elevation="2dp"
android:focusable="true"
android:focusableInTouchMode="true"
android:background="?attr/colorBackgroundFloating"/>
android:background="@drawable/floating_popup_background"/>

3
core/res/res/layout/floating_popup_menu_button.xml
View File

@@ -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"

12
core/res/res/layout/floating_popup_menu_image_button.xml
View File

@@ -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>

4
core/res/res/layout/floating_popup_open_overflow_button.xml
View File

@@ -20,6 +20,10 @@
android:layout_height="match_parent"
android:minWidth="@dimen/floating_toolbar_menu_button_minimum_width"
android:minHeight="@dimen/floating_toolbar_height"
android:paddingStart="0dp"
android:paddingTop="0dp"
android:paddingBottom="0dp"
android:paddingEnd="4dp"
android:src="@drawable/ic_menu_moreoverflow_material"
android:contentDescription="@string/floating_toolbar_open_overflow_description"
android:background="?attr/selectableItemBackgroundBorderless" />

14
core/res/res/layout/floating_popup_overflow_image_list_item.xml
View File

@@ -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_overflow_image_button_width"
android:minHeight="@dimen/floating_toolbar_height"
android:focusable="false"
android:focusableInTouchMode="false"
android:importantForAccessibility="no">
<ImageView
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_overflow_image_button_width"
android:layout_height="@dimen/floating_toolbar_height"
android:layout_marginStart="18dp"
android:paddingTop="@dimen/floating_toolbar_menu_image_button_vertical_padding"
android:paddingStart="@dimen/floating_toolbar_overflow_side_padding"
android:paddingBottom="@dimen/floating_toolbar_menu_image_button_vertical_padding"
android:paddingEnd="@dimen/floating_toolbar_overflow_side_padding"
android:layout_margin="0dp"
android:scaleType="centerInside"/>
</LinearLayout>

5
core/res/res/layout/floating_popup_overflow_list_item → core/res/res/layout/floating_popup_overflow_list_item.xml
View File

@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical"
android:gravity="start|center_vertical"
android:minWidth="@dimen/floating_toolbar_menu_button_side_padding"
android:minHeight="@dimen/floating_toolbar_height"
android:paddingStart="@dimen/floating_toolbar_overflow_side_padding"
@@ -29,7 +29,8 @@
android:layout_margin="0dp"
android:singleLine="true"
android:ellipsize="end"
android:fontFamily="sans-serif"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/floating_toolbar_text_size"
android:textColor="?attr/colorForeground"
android:textAllCaps="true" />

3
core/res/res/values/dimens.xml
View File

@@ -387,7 +387,10 @@
<!-- Floating toolbar dimensions -->
<dimen name="floating_toolbar_height">48dp</dimen>
<dimen name="floating_toolbar_menu_image_button_width">56dp</dimen>
<dimen name="floating_toolbar_menu_image_button_vertical_padding">12dp</dimen>
<dimen name="floating_toolbar_menu_button_side_padding">16dp</dimen>
<dimen name="floating_toolbar_overflow_image_button_width">60dp</dimen>
<dimen name="floating_toolbar_overflow_side_padding">18dp</dimen>
<dimen name="floating_toolbar_text_size">14sp</dimen>
<dimen name="floating_toolbar_menu_button_minimum_width">48dp</dimen>