Merge "Get rid of negative margins" into nyc-dev (cd2273c1) · Commits · e / os / android_frameworks_base

core/res/res/layout/notification_action_list.xml

deleted100644 → 0

+0 −30

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

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/actions"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:visibility="gone"
		android:layout_marginBottom="8dp"
		android:showDividers="middle"
		android:divider="?android:attr/listDivider"
		android:dividerPadding="12dp"
		>
		<!-- actions will be added here -->
		</LinearLayout>

+1 −3

Original line number	Diff line number	Diff line
		@@ -17,9 +17,7 @@
		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/actions_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="-16dp"
		android:layout_marginEnd="-16dp">
		android:layout_height="wrap_content">
		<LinearLayout
		android:id="@+id/actions"
		android:layout_width="match_parent"

+1 −5

Original line number	Diff line number	Diff line
		@@ -60,9 +60,5 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		/>
		<include
		layout="@layout/notification_material_action_list"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		/>
		<include layout="@layout/notification_material_action_list" />
		</LinearLayout>

+5 −4

Original line number	Diff line number	Diff line
		@@ -27,8 +27,6 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="top"
		android:paddingStart="@dimen/notification_content_margin_start"
		android:paddingEnd="@dimen/notification_content_margin_end"
		android:layout_marginTop="@dimen/notification_content_margin_top"
		android:clipToPadding="false"
		android:orientation="vertical"
		@@ -37,6 +35,8 @@
		android:id="@+id/notification_main_column"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="@dimen/notification_content_margin_start"
		android:layout_marginEnd="@dimen/notification_content_margin_end"
		android:orientation="vertical">
		<include layout="@layout/notification_template_part_line1"/>
		<include layout="@layout/notification_template_progress"/>
		@@ -50,14 +50,15 @@
		android:layout_weight="1"
		android:layout_marginTop="13dp"
		android:layout_marginBottom="16dp"
		android:layout_marginStart="@dimen/notification_content_margin_start"
		android:layout_marginEnd="@dimen/notification_content_margin_end"
		android:scaleType="centerCrop"
		/>

		<ViewStub android:layout="@layout/notification_material_reply_text"
		android:id="@+id/notification_material_reply_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="-16dp"
		android:layout_marginEnd="-16dp"
		/>
		<include layout="@layout/notification_material_action_list" />
		</LinearLayout>

+34 −27

Original line number	Diff line number	Diff line
		@@ -22,6 +22,15 @@
		android:tag="bigText"
		>
		<include layout="@layout/notification_template_header" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="top"
		android:layout_marginTop="@dimen/notification_content_margin_top"
		android:clipToPadding="false"
		android:orientation="vertical">

		<LinearLayout
		android:id="@+id/notification_main_column"
		android:layout_width="match_parent"
		@@ -29,7 +38,6 @@
		android:layout_gravity="top"
		android:paddingStart="@dimen/notification_content_margin_start"
		android:paddingEnd="@dimen/notification_content_margin_end"
		android:layout_marginTop="@dimen/notification_content_margin_top"
		android:clipToPadding="false"
		android:minHeight="@dimen/notification_min_content_height"
		android:orientation="vertical"
		@@ -47,13 +55,12 @@
		android:gravity="top"
		android:visibility="gone"
		/>
		</LinearLayout>

		<ViewStub android:layout="@layout/notification_material_reply_text"
		android:id="@+id/notification_material_reply_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="-16dp"
		android:layout_marginEnd="-16dp"
		/>
		android:layout_height="wrap_content" />
		<include layout="@layout/notification_material_action_list" />
		</LinearLayout>
		<include layout="@layout/notification_template_right_icon" />