Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 574ed553 authored by Dan Sandler's avatar Dan Sandler Committed by Android (Google) Code Review
Browse files

Merge "Remove unneeded layouts."

parents 3bd2c6ff 4b069cc8

core/res/res/layout/notification_action.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.

-->



<Button xmlns:android="http://schemas.android.com/apk/res/android"

    style="?android:attr/borderlessButtonStyle" 

    android:id="@+id/action0"

    android:layout_width="0dp"

    android:layout_height="48dp"

    android:layout_weight="1"

    android:gravity="start|center_vertical"

    android:drawablePadding="8dp"

    android:paddingStart="8dp"

    android:textColor="#ccc"

    android:textSize="14dp"

    android:singleLine="true"

    android:ellipsize="end"

    />

core/res/res/layout/notification_action_tombstone.xml

deleted100644 → 0
+0 −32
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.

-->



<Button xmlns:android="http://schemas.android.com/apk/res/android"

    style="?android:attr/borderlessButtonStyle" 

    android:id="@+id/action0"

    android:layout_width="0dp"

    android:layout_height="48dp"

    android:layout_weight="1"

    android:gravity="start|center_vertical"

    android:drawablePadding="8dp"

    android:paddingStart="8dp"

    android:textColor="#ccc"

    android:textSize="14dp"

    android:singleLine="true"

    android:ellipsize="end"

    android:alpha="0.5"

    android:enabled="false"

    />

core/res/res/layout/notification_template_base.xml

deleted100644 → 0
+0 −136
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.

-->



<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:internal="http://schemas.android.com/apk/prv/res/android"

    android:background="@android:drawable/notification_bg"

    android:id="@+id/status_bar_latest_event_content"

    android:layout_width="match_parent"

    android:layout_height="64dp"

    internal:layout_minHeight="64dp"

    internal:layout_maxHeight="64dp"

    >

    <ImageView android:id="@+id/icon"

        android:layout_width="@dimen/notification_large_icon_width"

        android:layout_height="@dimen/notification_large_icon_height"

        android:background="@android:drawable/notification_template_icon_bg"

        android:scaleType="center"

        />

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="fill_vertical"

        android:layout_marginStart="@dimen/notification_large_icon_width"

        android:minHeight="@dimen/notification_large_icon_height"

        android:orientation="vertical"

        android:paddingEnd="8dp"

        android:paddingTop="2dp"

        android:paddingBottom="2dp"

        android:gravity="top"

        >

        <LinearLayout

            android:id="@+id/line1"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="6dp"

            android:layout_marginStart="8dp"

            android:orientation="horizontal"

            >

            <TextView android:id="@+id/title"

                android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:fadingEdge="horizontal"

                android:layout_weight="1"

                />

            <ViewStub android:id="@+id/time"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_weight="0"

                android:visibility="gone"

                android:layout="@layout/notification_template_part_time"

                />

            <ViewStub android:id="@+id/chronometer"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_weight="0"

                android:visibility="gone"

                android:layout="@layout/notification_template_part_chronometer"

                />

        </LinearLayout>

        <TextView android:id="@+id/text2"

            android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Line2"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="-2dp"

            android:layout_marginBottom="-2dp"

            android:layout_marginStart="8dp"

            android:singleLine="true"

            android:fadingEdge="horizontal"

            android:ellipsize="marquee"

            android:visibility="gone"

            />

        <ProgressBar

            android:id="@android:id/progress"

            android:layout_width="match_parent"

            android:layout_height="12dp"

            android:layout_marginStart="8dp"

            android:visibility="gone"

            style="?android:attr/progressBarStyleHorizontal"

            />

        <LinearLayout

            android:id="@+id/line3"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:gravity="center_vertical"

            android:layout_marginStart="8dp"

            >

            <TextView android:id="@+id/text"

                android:textAppearance="@style/TextAppearance.StatusBar.EventContent"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:layout_gravity="center"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:fadingEdge="horizontal"

                />

            <TextView android:id="@+id/info"

                android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:layout_weight="0"

                android:singleLine="true"

                android:gravity="center"

                android:paddingStart="8dp"

                />

            <ImageView android:id="@+id/right_icon"

                android:layout_width="16dp"

                android:layout_height="16dp"

                android:layout_gravity="center"

                android:layout_weight="0"

                android:layout_marginStart="8dp"

                android:scaleType="centerInside"

                android:visibility="gone"

                android:drawableAlpha="153"

                />

        </LinearLayout>

    </LinearLayout>

</FrameLayout>

core/res/res/layout/notification_template_big_base.xml

deleted100644 → 0
+0 −167
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.

-->



<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:internal="http://schemas.android.com/apk/prv/res/android"

    android:background="@android:drawable/notification_bg"

    android:id="@+id/status_bar_latest_event_content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    internal:layout_minHeight="65dp"

    internal:layout_maxHeight="unbounded"

    >

    <ImageView android:id="@+id/icon"

        android:layout_width="@dimen/notification_large_icon_width"

        android:layout_height="@dimen/notification_large_icon_height"

        android:background="@android:drawable/notification_template_icon_bg"

        android:scaleType="center"

        />

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="fill_vertical"

        android:minHeight="@dimen/notification_large_icon_height"

        android:orientation="vertical"

        android:gravity="top"

        >

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/notification_large_icon_width"

            android:minHeight="@dimen/notification_large_icon_height"

            android:paddingTop="2dp"

            android:orientation="vertical"

            >

            <LinearLayout

                android:id="@+id/line1"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:paddingTop="6dp"

                android:layout_marginEnd="8dp"

                android:layout_marginStart="8dp"

                android:orientation="horizontal"

                >

                <TextView android:id="@+id/title"

                    android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:singleLine="true"

                    android:ellipsize="marquee"

                    android:fadingEdge="horizontal"

                    android:layout_weight="1"

                    />

                <ViewStub android:id="@+id/time"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_weight="0"

                    android:visibility="gone"

                    android:layout="@layout/notification_template_part_time"

                    />

                <ViewStub android:id="@+id/chronometer"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_weight="0"

                    android:visibility="gone"

                    android:layout="@layout/notification_template_part_chronometer"

                    />

            </LinearLayout>

            <TextView android:id="@+id/text2"

                android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Line2"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="-2dp"

                android:layout_marginBottom="-2dp"

                android:layout_marginStart="8dp"

                android:layout_marginEnd="8dp"

                android:singleLine="true"

                android:fadingEdge="horizontal"

                android:ellipsize="marquee"

                android:visibility="gone"

                />

            <TextView android:id="@+id/big_text"

                android:textAppearance="@style/TextAppearance.StatusBar.EventContent"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginStart="8dp"

                android:layout_marginEnd="8dp"

                android:singleLine="false"

                android:visibility="gone"

                />

            <LinearLayout

                android:id="@+id/line3"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginStart="8dp"

                android:layout_marginEnd="8dp"

                android:orientation="horizontal"

                android:gravity="center_vertical"

                >

                <TextView android:id="@+id/text"

                    android:textAppearance="@style/TextAppearance.StatusBar.EventContent"

                    android:layout_width="0dp"

                    android:layout_height="wrap_content"

                    android:layout_weight="1"

                    android:layout_gravity="center"

                    android:singleLine="true"

                    android:ellipsize="marquee"

                    android:fadingEdge="horizontal"

                    />

                <TextView android:id="@+id/info"

                    android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="center"

                    android:layout_weight="0"

                    android:singleLine="true"

                    android:gravity="center"

                    android:paddingStart="8dp"

                    />

                <ImageView android:id="@+id/right_icon"

                    android:layout_width="16dp"

                    android:layout_height="16dp"

                    android:layout_gravity="center"

                    android:layout_weight="0"

                    android:layout_marginStart="8dp"

                    android:scaleType="centerInside"

                    android:visibility="gone"

                    android:drawableAlpha="153"

                    />

            </LinearLayout>

            <ProgressBar

                android:id="@android:id/progress"

                android:layout_width="match_parent"

                android:layout_height="12dp"

                android:layout_marginBottom="8dp"

                android:layout_marginStart="8dp"

                android:layout_marginEnd="8dp"

                android:visibility="gone"

                style="?android:attr/progressBarStyleHorizontal"

                />

        </LinearLayout>

        <ImageView

            android:layout_width="match_parent"

            android:layout_height="1px"

            android:id="@+id/action_divider"

            android:visibility="gone"

            android:background="?android:attr/dividerHorizontal" />

        <include

            layout="@layout/notification_action_list"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/notification_large_icon_width"

            />

    </LinearLayout>

</FrameLayout>

core/res/res/layout/notification_template_big_picture.xml

deleted100644 → 0
+0 −61
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.

-->



<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:internal="http://schemas.android.com/apk/prv/res/android"

    android:background="@android:drawable/notification_bg"

    android:id="@+id/status_bar_latest_event_content"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    internal:layout_minHeight="65dp"

    internal:layout_maxHeight="unbounded"

    >

    <ImageView

        android:id="@+id/big_picture"

        android:layout_width="match_parent"

        android:layout_height="192dp"

        android:layout_marginTop="64dp"

        android:layout_gravity="bottom"

        android:scaleType="centerCrop"

        />

    <ImageView

        android:layout_width="match_parent"

        android:layout_height="6dp"

        android:layout_marginTop="64dp"

        android:scaleType="fitXY"

        android:src="@drawable/title_bar_shadow"

        />

    <include layout="@layout/notification_template_base"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        />

  <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="208dp"

        android:paddingStart="64dp"

        android:layout_gravity="bottom"

        android:background="#CC111111"

        >

        <include

            layout="@layout/notification_action_list"

            android:id="@+id/actions"

            android:layout_gravity="bottom"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            />

    </FrameLayout>

</FrameLayout>