Merge "Fab for clock app" into lmp-dev (b5e0657b) · Commits · e / os / android_packages_apps_DeskClock

res/drawable/floating_action_button.xml

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2014 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.
		-->

		<ripple xmlns:android="http://schemas.android.com/apk/res/android"
		android:color="@color/clock_white">
		<item>
		<shape android:shape="oval">
		<solid android:color="@color/hot_pink" />
		</shape>
		</item>
		</ripple>

+0 −16

Original line number	Diff line number	Diff line
		@@ -43,20 +43,4 @@
		android:layout_marginRight="20dp"
		android:layout_gravity="center" />
		</LinearLayout>
		<ImageButton
		android:id="@+id/cities_button"
		android:contentDescription="@string/button_cities"
		android:layout_width="@dimen/footer_button_size"
		android:layout_height="@dimen/footer_button_size"
		android:layout_marginTop="@dimen/footer_button_layout_margin"
		android:layout_marginBottom="@dimen/footer_button_layout_margin"
		android:layout_marginRight="@dimen/footer_button_layout_margin"
		android:layout_marginEnd="@dimen/footer_button_layout_margin"
		android:layout_marginLeft="@dimen/footer_button_layout_margin"
		android:layout_marginStart="@dimen/footer_button_layout_margin"
		android:layout_gravity="right\|bottom"
		android:src="@drawable/ic_globe"
		style="@style/button"
		android:onClick="clockButtonsOnClick"
		android:background="@drawable/main_button_normal" />
		</FrameLayout>

+9 −11

Original line number	Diff line number	Diff line
		@@ -29,13 +29,12 @@

		<com.android.deskclock.CircleButtonsLayout
		android:id="@+id/stopwatch_circle"
		android:layout_width="0dip"
		android:layout_height="match_parent"
		android:layout_marginLeft="@dimen/circle_margin"
		android:layout_marginStart="@dimen/circle_margin"
		android:layout_marginRight="@dimen/circle_margin"
		android:layout_marginEnd="@dimen/circle_margin"
		android:layout_weight="0.95" >
		android:layout_width="@dimen/circle_size"
		android:layout_height="@dimen/circle_size"
		android:layout_gravity="center"
		android:layout_marginLeft="32dip"
		android:layout_marginBottom="32dip"
		android:layout_marginRight="32dip">

		<com.android.deskclock.timer.CountingTimerView
		android:id="@+id/stopwatch_time_text"
		@@ -59,6 +58,7 @@

		<TextView
		android:id="@+id/stopwatch_stop"
		android:visibility="invisible"
		android:layout_gravity="bottom\|center_horizontal"
		android:gravity="center"
		android:layout_marginBottom="0dip"
		@@ -88,11 +88,9 @@

		<ListView
		android:id="@+id/laps_list"
		android:layout_weight="1"
		android:paddingRight="@dimen/sw_padding_end"
		android:paddingEnd="@dimen/sw_padding_end"
		android:layout_margin="64dip"
		android:layout_gravity="center"
		android:layout_width="0dip"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content" />

		<Space

+3 −11

Original line number	Diff line number	Diff line
		@@ -89,19 +89,11 @@
		layout="@layout/three_keys_view" />

		<FrameLayout
		android:id="@+id/timer_footer"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom">

		<ImageButton
		android:id="@+id/timer_start"
		style="@style/button"
		android:layout_width="@dimen/footer_button_size"
		android:layout_height="@dimen/footer_button_size"
		android:layout_gravity="center"
		android:layout_margin="@dimen/footer_button_layout_margin"
		android:background="@drawable/main_button_normal"
		android:src="@drawable/ic_fab_play_sm" />
		android:layout_gravity="bottom">

		<ImageButton
		android:id="@+id/timer_cancel"

+0 −15

Original line number	Diff line number	Diff line
		@@ -51,21 +51,6 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom" >
		<ImageButton
		android:id="@+id/alarm_add_alarm"
		android:contentDescription="@string/add_alarm"
		android:layout_width="@dimen/footer_button_size"
		android:layout_height="@dimen/footer_button_size"
		android:layout_marginTop="@dimen/footer_button_layout_margin"
		android:layout_marginBottom="@dimen/footer_button_layout_margin"
		android:layout_marginRight="@dimen/footer_button_layout_margin"
		android:layout_marginEnd="@dimen/footer_button_layout_margin"
		android:layout_marginLeft="@dimen/footer_button_layout_margin"
		android:layout_marginStart="@dimen/footer_button_layout_margin"
		android:layout_gravity="center"
		android:src="@drawable/ic_add"
		style="@style/button"
		android:background="@drawable/main_button_normal" />
		<ImageButton
		android:id="@+id/menu_button"
		android:contentDescription="@string/button_menu"