Settings: Fabulous "Add rule" button. (b8e02b8b) · Commits · e / os / android_packages_apps_Settings

res/anim/fab_elevation.xml

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 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.
		-->
		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:state_enabled="true" android:state_pressed="true">
		<set>
		<objectAnimator
		android:duration="@android:integer/config_shortAnimTime"
		android:propertyName="translationZ"
		android:valueTo="@dimen/fab_press_translation_z"
		android:valueType="floatType" />
		</set>
		</item>
		<item>
		<set>
		<objectAnimator
		android:duration="@android:integer/config_shortAnimTime"
		android:propertyName="translationZ"
		android:valueTo="0"
		android:valueType="floatType" />
		</set>
		</item>
		</selector>
		No newline at end of file

+8 −9

Original line number	Diff line number	Diff line
		@@ -13,12 +13,11 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<menu xmlns:android="http://schemas.android.com/apk/res/android">
		<item
		android:id="@+id/add"
		android:title="@string/zen_mode_time_add_rule"
		android:icon="@drawable/ic_menu_add_white"
		android:visible="true"
		android:showAsAction="collapseActionView\|ifRoom" />
		</menu>
		<ripple xmlns:android="http://schemas.android.com/apk/res/android"
		android:color="@color/fab_ripple">
		<item>
		<shape>
		<solid android:color="@color/fab_shape" />
		</shape>
		</item>
		</ripple>
		No newline at end of file

+12 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,18 @@

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

		<com.android.settings.widget.FloatingActionButton
		android:id="@+id/fab"
		android:visibility="gone"
		android:clickable="true"
		android:layout_width="@dimen/fab_size"
		android:layout_height="@dimen/fab_size"
		android:layout_gravity="bottom\|end"
		android:layout_marginEnd="@dimen/fab_margin"
		android:layout_marginBottom="@dimen/fab_margin"
		android:elevation="@dimen/fab_elevation"
		android:background="@drawable/fab_background" />

		</FrameLayout>

		<TextView android:id="@android:id/empty"

+1 −0

Original line number	Diff line number	Diff line
		@@ -89,4 +89,5 @@
		<dimen name="wifi_assistant_text_padding">24dp</dimen>

		<dimen name="confirm_credentials_security_method_margin">72dp</dimen>
		<dimen name="fab_margin">24dp</dimen>
		</resources>

+2 −0

Original line number	Diff line number	Diff line
		@@ -81,4 +81,6 @@

		<color name="warning">#ff5621</color>
		<color name="confirm_device_credential_dark_background">#263238</color>
		<color name="fab_ripple">#1fffffff</color><!-- 12% white -->
		<color name="fab_shape">#ff009688</color><!-- Teal 500 -->
		</resources>