Merge "Remove tools attributes from framework XML" into mnc-dev (b4b44378) · Commits · e / os / android_frameworks_base

core/res/res/layout-land/time_picker_material.xml

+6 −23

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@
		-->

		<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:tools="http://schemas.android.com/tools"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		@@ -27,8 +26,7 @@
		android:layout_column="0"
		android:layout_row="0"
		android:layout_rowSpan="3"
		android:layout_gravity="center\|fill"
		tools:background="@color/accent_material_light" />
		android:layout_gravity="center\|fill" />

		<RelativeLayout
		android:layout_width="wrap_content"
		@@ -56,20 +54,14 @@
		android:textAppearance="@style/TextAppearance.Material.TimePicker.TimeLabel"
		android:singleLine="true"
		android:ellipsize="none"
		android:gravity="right"
		tools:text="23"
		tools:textSize="@dimen/timepicker_time_label_size"
		tools:textColor="@color/white" />
		android:gravity="right" />

		<TextView
		android:id="@+id/separator"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textAppearance="@style/TextAppearance.Material.TimePicker.TimeLabel"
		android:importantForAccessibility="no"
		tools:text=":"
		tools:textSize="@dimen/timepicker_time_label_size"
		tools:textColor="@color/white" />
		android:importantForAccessibility="no" />

		<!-- The minutes should always be to the right of the separator,
		regardless of the current locale's layout direction. -->
		@@ -80,10 +72,7 @@
		android:textAppearance="@style/TextAppearance.Material.TimePicker.TimeLabel"
		android:singleLine="true"
		android:ellipsize="none"
		android:gravity="left"
		tools:text="59"
		tools:textSize="@dimen/timepicker_time_label_size"
		tools:textColor="@color/white" />
		android:gravity="left" />
		</LinearLayout>

		<!-- The layout alignment of this view will switch between toRightOf
		@@ -106,10 +95,7 @@
		android:paddingTop="@dimen/timepicker_am_top_padding"
		android:lines="1"
		android:ellipsize="none"
		android:includeFontPadding="false"
		tools:text="AM"
		tools:textSize="@dimen/timepicker_ampm_label_size"
		tools:textColor="@color/white" />
		android:includeFontPadding="false" />

		<CheckedTextView
		android:id="@+id/pm_label"
		@@ -121,10 +107,7 @@
		android:paddingTop="@dimen/timepicker_pm_top_padding"
		android:lines="1"
		android:ellipsize="none"
		android:includeFontPadding="false"
		tools:text="PM"
		tools:textSize="@dimen/timepicker_ampm_label_size"
		tools:textColor="@color/white" />
		android:includeFontPadding="false" />
		</LinearLayout>
		</RelativeLayout>

core/res/res/layout/date_picker_header_material.xml

+3 −13

Original line number	Diff line number	Diff line
		@@ -16,17 +16,13 @@
		-->

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:tools="http://schemas.android.com/tools"
		android:id="@+id/date_picker_header"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingBottom="18dp"
		android:paddingStart="?attr/dialogPreferredPadding"
		android:paddingEnd="?attr/dialogPreferredPadding"
		android:orientation="vertical"
		tools:background="@color/accent_material_light"
		tools:paddingStart="24dp"
		tools:paddingEnd="24dp">
		android:orientation="vertical">

		<!-- Top padding should stay on this view so that
		the touch target is a bit larger. -->
		@@ -35,10 +31,7 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="16dp"
		android:textAppearance="@style/TextAppearance.Material.DatePicker.YearLabel"
		tools:text="2015"
		tools:textSize="@dimen/date_picker_year_label_size"
		tools:textColor="@color/white" />
		android:textAppearance="@style/TextAppearance.Material.DatePicker.YearLabel" />

		<TextView
		android:id="@+id/date_picker_header_date"
		@@ -47,9 +40,6 @@
		android:textAppearance="@style/TextAppearance.Material.DatePicker.DateLabel"
		android:gravity="start"
		android:maxLines="2"
		android:ellipsize="none"
		tools:text="Thu, Sep 30"
		tools:textSize="@dimen/date_picker_date_label_size"
		tools:textColor="@color/white" />
		android:ellipsize="none" />

		</LinearLayout>

core/res/res/layout/time_picker_header_material.xml

+6 −23

Original line number	Diff line number	Diff line
		@@ -18,13 +18,11 @@
		<!-- This layout is duplicated in land/time_picker_material.xml, so any
		changes made here need to be manually copied over. -->
		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:tools="http://schemas.android.com/tools"
		android:id="@+id/time_header"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="horizontal"
		android:padding="@dimen/timepicker_separator_padding"
		tools:background="@color/accent_material_light">
		android:padding="@dimen/timepicker_separator_padding">

		<!-- The hour should always be to the left of the separator,
		regardless of the current locale's layout direction. -->
		@@ -37,10 +35,7 @@
		android:textAppearance="@style/TextAppearance.Material.TimePicker.TimeLabel"
		android:singleLine="true"
		android:ellipsize="none"
		android:gravity="right"
		tools:text="23"
		tools:textSize="@dimen/timepicker_time_label_size"
		tools:textColor="@color/white" />
		android:gravity="right" />

		<TextView
		android:id="@+id/separator"
		@@ -50,10 +45,7 @@
		android:layout_marginRight="@dimen/timepicker_separator_padding"
		android:layout_centerInParent="true"
		android:textAppearance="@style/TextAppearance.Material.TimePicker.TimeLabel"
		android:importantForAccessibility="no"
		tools:text=":"
		tools:textSize="@dimen/timepicker_time_label_size"
		tools:textColor="@color/white" />
		android:importantForAccessibility="no" />

		<!-- The minutes should always be to the left of the separator,
		regardless of the current locale's layout direction. -->
		@@ -66,10 +58,7 @@
		android:textAppearance="@style/TextAppearance.Material.TimePicker.TimeLabel"
		android:singleLine="true"
		android:ellipsize="none"
		android:gravity="left"
		tools:text="59"
		tools:textSize="@dimen/timepicker_time_label_size"
		tools:textColor="@color/white" />
		android:gravity="left" />

		<!-- The layout alignment of this view will switch between toRightOf
		@id/minutes and toLeftOf @id/hours depending on the locale. -->
		@@ -90,10 +79,7 @@
		android:paddingTop="@dimen/timepicker_am_top_padding"
		android:textAppearance="@style/TextAppearance.Material.TimePicker.AmPmLabel"
		android:lines="1"
		android:ellipsize="none"
		tools:text="AM"
		tools:textSize="@dimen/timepicker_ampm_label_size"
		tools:textColor="@color/white" />
		android:ellipsize="none" />
		<CheckedTextView
		android:id="@+id/pm_label"
		android:layout_width="wrap_content"
		@@ -103,9 +89,6 @@
		android:paddingTop="@dimen/timepicker_pm_top_padding"
		android:textAppearance="@style/TextAppearance.Material.TimePicker.AmPmLabel"
		android:lines="1"
		android:ellipsize="none"
		tools:text="PM"
		tools:textSize="@dimen/timepicker_ampm_label_size"
		tools:textColor="@color/white" />
		android:ellipsize="none" />
		</LinearLayout>
		</RelativeLayout>