Merge "Part 1: Tweaking history transition to match design." (3f64f3a3) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/ic_history.xml

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2016 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.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24">

		<path
		android:fillColor="#FFFFFF"
		android:pathData="M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89 .07 .14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7
		7-3.13 7-7 7c-1.93 0-3.68-.79-4.94-2.06l-1.42 1.42C8.27 19.99 10.51 21 13
		21c4.97 0 9-4.03 9-9s-4.03-9-9-9zm-1 5v5l4.28 2.54 .72 -1.21-3.5-2.08V8H12z" />
		</vector>
		No newline at end of file

+0 −14

Original line number	Diff line number	Diff line
		@@ -17,14 +17,6 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent">
		<!-- Status Bar Scrim View -->
		<ImageView
		android:id="@+id/status_bar_scrim"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal\|top"
		android:scaleType="fitXY"
		android:src="@drawable/recents_status_gradient" />

		<!-- Recents View -->
		<com.android.systemui.recents.views.RecentsView
		@@ -33,12 +25,6 @@
		android:layout_height="match_parent">
		</com.android.systemui.recents.views.RecentsView>

		<!-- History View -->
		<ViewStub android:id="@+id/history_view_stub"
		android:layout="@layout/recents_history"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />

		<!-- Nav Bar Scrim View -->
		<ImageView
		android:id="@+id/nav_bar_scrim"

+0 −1

Original line number	Diff line number	Diff line
		@@ -24,5 +24,4 @@
		android:textColor="#ffffffff"
		android:text="@string/recents_empty_message"
		android:fontFamily="sans-serif"
		android:background="#80000000"
		android:visibility="gone" />
		No newline at end of file

+0 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="#99000000"
		android:orientation="vertical">
		<android.support.v7.widget.RecyclerView
		android:id="@+id/list"

+13 −4

Original line number	Diff line number	Diff line
		@@ -15,15 +15,24 @@
		-->
		<TextView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:id="@+id/button"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:gravity="start\|center_vertical"
		android:text="@string/recents_show_history_button_label"
		android:paddingStart="14dp"
		android:paddingEnd="14dp"
		android:paddingTop="12dp"
		android:paddingBottom="12dp"
		android:text="@string/recents_history_button_label"
		android:textSize="14sp"
		android:textColor="#FFFFFF"
		android:textAllCaps="true"
		android:drawableStart="@drawable/ic_history"
		android:drawablePadding="6dp"
		android:shadowColor="#99000000"
		android:shadowDx="0"
		android:shadowDy="2"
		android:shadowRadius="5"
		android:fontFamily="sans-serif-medium" />
		No newline at end of file
		android:fontFamily="sans-serif-medium"
		android:background="?android:selectableItemBackground"
		android:visibility="invisible" />