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

Commit c09ee07c authored by Mac Young's avatar Mac Young Committed by Android (Google) Code Review
Browse files

Merge "Remove car activity resolver framework references" into main

parents e4e5cb4b 56d78937
Loading
Loading
Loading
Loading
+0 −20
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (C) 2024 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.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
    <solid android:color="?attr/colorBackgroundFloating" />
    <corners android:radius="@dimen/car_activity_resolver_corner_radius" />
</shape>
 No newline at end of file
+0 −127
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
* Copyright 2019, 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.
*/
-->
<com.android.internal.widget.ResolverDrawerLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="@dimen/car_activity_resolver_width"
    android:layout_height="wrap_content"
    android:layout_gravity="center"
    android:id="@id/contentPanel">

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical"
        android:background="@drawable/car_activity_resolver_list_background">

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:background="@drawable/car_activity_resolver_list_background"
            android:orientation="horizontal"
            android:paddingVertical="@dimen/car_padding_4"
            android:paddingHorizontal="@dimen/car_padding_4" >
            <TextView
                android:id="@+id/profile_button"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:visibility="gone" />

            <TextView
                android:id="@+id/title"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="start"
                android:textAppearance="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle" />
        </LinearLayout>

        <FrameLayout
            android:id="@+id/stub"
            android:visibility="gone"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"/>

        <TabHost
            android:id="@+id/profile_tabhost"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_alignParentTop="true"
            android:layout_centerHorizontal="true"
            android:background="?android:attr/colorBackgroundFloating">
            <LinearLayout
                android:orientation="vertical"
                android:layout_width="match_parent"
                android:layout_height="wrap_content">
                <TabWidget
                    android:id="@android:id/tabs"
                    android:visibility="gone"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content">
                </TabWidget>
                <View
                    android:id="@+id/resolver_tab_divider"
                    android:visibility="gone"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content" />
                <FrameLayout
                    android:id="@android:id/tabcontent"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content">
                    <com.android.internal.app.ResolverViewPager
                        android:id="@+id/profile_pager"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"/>
                </FrameLayout>
            </LinearLayout>
        </TabHost>

        <LinearLayout
            android:id="@+id/button_bar"
            android:visibility="gone"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginVertical="@dimen/car_padding_4"
            android:layout_marginHorizontal="@dimen/car_padding_4"
            android:padding="0dp"
            android:gravity="center"
            android:background="@drawable/car_activity_resolver_list_background"
            android:orientation="vertical">

            <Button
                android:id="@+id/button_once"
                android:layout_width="match_parent"
                android:layout_height="@dimen/car_button_height"
                android:enabled="false"
                android:layout_gravity="center"
                android:layout_marginBottom="@dimen/car_padding_2"
                android:text="@string/activity_resolver_use_once"
                android:onClick="onButtonClick"/>

            <Button
                android:id="@+id/button_always"
                android:layout_width="match_parent"
                android:layout_height="@dimen/car_button_height"
                android:enabled="false"
                android:layout_gravity="center"
                android:text="@string/activity_resolver_use_always"
                android:onClick="onButtonClick"/>
        </LinearLayout>

    </LinearLayout>

</com.android.internal.widget.ResolverDrawerLayout>
 No newline at end of file
+0 −159
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
* Copyright 2019, 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.
*/
-->
<com.android.internal.widget.ResolverDrawerLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="@dimen/car_activity_resolver_width"
    android:layout_height="wrap_content"
    android:layout_gravity="center"
    android:id="@id/contentPanel">

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical"
        android:layout_gravity="center"
        android:background="@drawable/car_activity_resolver_list_background">

        <FrameLayout
            android:id="@+id/stub"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:background="@drawable/car_activity_resolver_list_background"/>


        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:minHeight="@dimen/car_activity_resolver_list_item_height"
            android:orientation="horizontal">

            <RadioButton
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:focusable="false"
                android:clickable="false"
                android:layout_marginStart="?attr/listPreferredItemPaddingStart"
                android:layout_gravity="start|center_vertical"
                android:checked="true"/>

            <ImageView
                android:id="@+id/icon"
                android:layout_width="@dimen/car_icon_size"
                android:layout_height="@dimen/car_icon_size"
                android:layout_gravity="start|center_vertical"
                android:layout_marginStart="@dimen/car_padding_4"
                android:src="@drawable/resolver_icon_placeholder"
                android:scaleType="fitCenter"/>

            <TextView
                android:id="@+id/title"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginHorizontal="?attr/listPreferredItemPaddingStart"
                style="?android:attr/textAppearanceListItem"
                android:layout_gravity="start|center_vertical" />

            <LinearLayout
                android:id="@+id/profile_button"
                android:visibility="gone"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content">

                <ImageView
                    android:id="@+id/icon"
                    android:visibility="gone"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content" />

                <TextView
                    android:id="@id/text1"
                    android:visibility="gone"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content" />
            </LinearLayout>
        </LinearLayout>

        <TabHost
            android:id="@+id/profile_tabhost"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_alignParentTop="true"
            android:layout_centerHorizontal="true"
            android:background="?attr/colorBackgroundFloating">
            <LinearLayout
                android:orientation="vertical"
                android:layout_width="match_parent"
                android:layout_height="wrap_content">
                <TabWidget
                    android:id="@android:id/tabs"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:visibility="gone">
                </TabWidget>
                <View
                    android:id="@+id/resolver_tab_divider"
                    android:visibility="gone"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content" />
                <FrameLayout
                    android:id="@android:id/tabcontent"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content">
                    <com.android.internal.app.ResolverViewPager
                        android:id="@+id/profile_pager"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content">
                    </com.android.internal.app.ResolverViewPager>
                </FrameLayout>
            </LinearLayout>
        </TabHost>

        <LinearLayout
            android:id="@+id/button_bar"
            android:visibility="gone"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginVertical="@dimen/car_padding_4"
            android:layout_marginHorizontal="@dimen/car_padding_4"
            android:gravity="center"
            android:background="@drawable/car_activity_resolver_list_background"
            android:orientation="vertical">

            <Button
                android:id="@+id/button_once"
                android:layout_width="match_parent"
                android:layout_height="@dimen/car_button_height"
                android:enabled="false"
                android:layout_gravity="center"
                android:layout_marginBottom="@dimen/car_padding_2"
                android:text="@string/activity_resolver_use_once"
                android:onClick="onButtonClick"/>

            <Button
                android:id="@+id/button_always"
                android:layout_width="match_parent"
                android:layout_height="@dimen/car_button_height"
                android:enabled="false"
                android:layout_gravity="center"
                android:text="@string/activity_resolver_use_always"
                android:onClick="onButtonClick"/>
        </LinearLayout>
    </LinearLayout>

</com.android.internal.widget.ResolverDrawerLayout>