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

Commit bd261ff8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove support v1"

parents b4076cb4 616397d2

AndroidManifest.xml

+0 −7
Original line number Diff line number Diff line
@@ -3104,13 +3104,6 @@ 
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.deletionhelper.AutomaticStorageManagerSettings" />

        </activity>



        <activity android:name="Settings$LegacySupportActivity"

                  android:label="@string/page_tab_title_support">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            android:value="com.android.settings.dashboard.SupportFragment"/>

        </activity>



        <!-- Information architecture host activities -->



        <!-- Alias for battery settings in new IA. Remove and merge metadata into TargetActivity -->

res/layout/support_account_spinner_item.xml

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

-->



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

    android:id="@android:id/text1"

    style="?android:attr/spinnerItemStyle"

    android:singleLine="true"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:ellipsize="marquee"

    android:textAppearance="?android:attr/textAppearanceSmall"

    android:textAlignment="inherit"/>

res/layout/support_disclaimer_content.xml

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

-->

<ScrollView

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:padding="24dp">



        <com.android.settingslib.widget.LinkTextView

            android:id="@+id/support_disclaimer_text"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingBottom="24dp"/>



        <CheckBox

            android:id="@+id/support_disclaimer_do_not_show_again"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/support_disclaimer_do_not_show"

            android:textColor="?android:attr/textColorSecondary"/>

    </LinearLayout>

</ScrollView>

res/layout/support_escalation_options.xml

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

-->



<LinearLayout

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

    style="@style/SupportEscalationCard"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">

    <TextView

        android:id="@+id/tile_title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:textAppearance="@style/TextAppearance.SupportTitle"/>

    <TextView

        android:id="@+id/tile_summary"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:paddingTop="8dp"

        android:paddingBottom="30dp"

        android:textAppearance="?android:attr/textAppearanceSmall"/>

    <TextView

        android:id="@+id/account_request_prefix"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:text="@string/support_account_request_prefix"

        android:textAppearance="?android:attr/textAppearanceSmall"/>

    <Spinner

        android:id="@+id/account_spinner"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="5dp"

        android:layout_marginStart="16dp"

        android:gravity="center_horizontal"/>

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="30dp"

        android:gravity="center_horizontal"

        android:orientation="horizontal">

        <LinearLayout

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="wrap_content"

            android:layout_marginStart="8dp"

            android:layout_marginEnd="8dp"

            android:gravity="center_horizontal"

            android:orientation="vertical">

            <Button

                android:id="@android:id/text1"

                style="@style/ActionPrimaryButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_margin="8dp"/>

            <TextView

                android:id="@+id/summary1"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="14dp"

                android:textAppearance="?android:attr/textAppearanceSmall"/>

        </LinearLayout>

        <LinearLayout

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="wrap_content"

            android:layout_marginStart="8dp"

            android:layout_marginEnd="8dp"

            android:gravity="center_horizontal"

            android:orientation="vertical">

            <Button

                android:id="@android:id/text2"

                style="@style/ActionPrimaryButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_margin="8dp"/>

            <TextView

                android:id="@+id/summary2"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="14dp"

                android:textAppearance="?android:attr/textAppearanceSmall"/>

        </LinearLayout>

    </LinearLayout>

</LinearLayout>

res/layout/support_fragment.xml

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

-->



<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:focusable="false"

    android:paddingStart="@dimen/dashboard_padding_start"

    android:paddingEnd="@dimen/dashboard_padding_end">

    <android.support.v7.widget.RecyclerView

        android:id="@+id/support_items"

        android:layout_height="match_parent"

        android:layout_width="match_parent"/>

</FrameLayout>