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

Commit 1b00af3f authored by Sumedh Sen's avatar Sumedh Sen
Browse files

AlertController cleanup 

Remove APIs from this isolated AlertController which are not used in
Package Installer app. Also, remove unused resources and classes.

Bug: 241139604
Test: Manual UI testing
Change-Id: I9428c761ff53aea21323fa420d42a5ab624b8bb2
parent ae22f8fb

packages/PackageInstaller/res/layout/alert_dialog.xml

deleted100644 → 0
+0 −152
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* //device/apps/common/res/layout/alert_dialog.xml

**

** Copyright 2006, 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/parentPanel"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:paddingTop="9dip"

    android:paddingBottom="3dip"

    android:paddingStart="3dip"

    android:paddingEnd="1dip">



    <LinearLayout android:id="@+id/topPanel"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="54dip"

        android:orientation="vertical">

        <LinearLayout android:id="@+id/title_template"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:gravity="center_vertical"

            android:layout_marginTop="6dip"

            android:layout_marginBottom="9dip"

            android:layout_marginStart="10dip"

            android:layout_marginEnd="10dip">

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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="top"

                android:paddingTop="6dip"

                android:paddingEnd="10dip"

                android:src="@drawable/ic_dialog_info" />

            <com.android.packageinstaller.DialogTitle android:id="@+id/alertTitle"

                style="?android:attr/textAppearanceLarge"

                android:singleLine="true"

                android:ellipsize="end"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:textAlignment="viewStart" />

        </LinearLayout>

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

            android:layout_width="match_parent"

            android:layout_height="1dip"

            android:visibility="gone"

            android:scaleType="fitXY"

            android:gravity="fill_horizontal"

            android:src="@android:drawable/divider_horizontal_dark" />

        <!-- If the client uses a customTitle, it will be added here. -->

    </LinearLayout>



    <LinearLayout android:id="@+id/contentPanel"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:orientation="vertical">

        <ScrollView android:id="@+id/scrollView"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="2dip"

            android:paddingBottom="12dip"

            android:paddingStart="14dip"

            android:paddingEnd="10dip"

            android:overScrollMode="ifContentScrolls">

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

                style="?android:attr/textAppearanceMedium"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:padding="5dip" />

        </ScrollView>

    </LinearLayout>



    <FrameLayout android:id="@+id/customPanel"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1">

        <FrameLayout android:id="@+id/custom"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="5dip"

            android:paddingBottom="5dip" />

    </FrameLayout>



    <LinearLayout android:id="@+id/buttonPanel"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="54dip"

        android:orientation="vertical" >

        <LinearLayout

            style="?android:attr/buttonBarStyle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:paddingTop="4dip"

            android:paddingStart="2dip"

            android:paddingEnd="2dip"

            android:measureWithLargestChild="true">

            <LinearLayout android:id="@+id/leftSpacer"

                android:layout_weight="0.25"

                android:layout_width="0dip"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:visibility="gone" />

            <Button android:id="@+id/button1"

                android:layout_width="0dip"

                android:layout_gravity="start"

                android:layout_weight="1"

                style="?android:attr/buttonBarPositiveButtonStyle"

                android:maxLines="2"

                android:layout_height="wrap_content" />

            <Button android:id="@+id/button3"

                android:layout_width="0dip"

                android:layout_gravity="center_horizontal"

                android:layout_weight="1"

                style="?android:attr/buttonBarNeutralButtonStyle"

                android:maxLines="2"

                android:layout_height="wrap_content" />

            <Button android:id="@+id/button2"

                android:layout_width="0dip"

                android:layout_gravity="end"

                android:layout_weight="1"

                style="?android:attr/buttonBarNegativeButtonStyle"

                android:maxLines="2"

                android:layout_height="wrap_content" />

            <LinearLayout android:id="@+id/rightSpacer"

                android:layout_width="0dip"

                android:layout_weight="0.25"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:visibility="gone" />

        </LinearLayout>

     </LinearLayout>

</LinearLayout>

packages/PackageInstaller/res/layout/alert_dialog_holo.xml

deleted100644 → 0
+0 −142
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2010, 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/parentPanel"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginStart="8dip"

    android:layout_marginEnd="8dip"

    android:orientation="vertical">



    <LinearLayout android:id="@+id/topPanel"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical">

        <View android:id="@+id/titleDividerTop"

            android:layout_width="match_parent"

            android:layout_height="2dip"

            android:visibility="gone"

            android:background="@android:color/holo_blue_light" />

        <LinearLayout android:id="@+id/title_template"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:gravity="center_vertical|start"

            android:minHeight="@dimen/alert_dialog_title_height"

            android:layout_marginStart="16dip"

            android:layout_marginEnd="16dip">

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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:paddingEnd="8dip"

                android:src="@null" />

            <com.android.packageinstaller.DialogTitle android:id="@+id/alertTitle"

                style="?android:attr/windowTitleStyle"

                android:singleLine="true"

                android:ellipsize="end"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:textAlignment="viewStart" />

        </LinearLayout>

        <View android:id="@+id/titleDivider"

            android:layout_width="match_parent"

            android:layout_height="2dip"

            android:visibility="gone"

            android:background="@android:color/holo_blue_light" />

        <!-- If the client uses a customTitle, it will be added here. -->

    </LinearLayout>



    <LinearLayout android:id="@+id/contentPanel"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:orientation="vertical"

        android:minHeight="64dp">

        <ScrollView android:id="@+id/scrollView"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:clipToPadding="false">

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

                style="?android:attr/textAppearanceMedium"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:paddingStart="16dip"

                android:paddingEnd="16dip"

                android:paddingTop="8dip"

                android:paddingBottom="8dip"/>

        </ScrollView>

    </LinearLayout>



    <FrameLayout android:id="@+id/customPanel"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:minHeight="64dp">

        <FrameLayout android:id="@+id/custom"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />

    </FrameLayout>



    <LinearLayout android:id="@+id/buttonPanel"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="@dimen/alert_dialog_button_bar_height"

        android:orientation="vertical"

        android:divider="?android:attr/dividerHorizontal"

        android:showDividers="beginning"

        android:dividerPadding="0dip">

        <LinearLayout

            style="?android:attr/buttonBarStyle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:layoutDirection="locale"

            android:measureWithLargestChild="true">

            <Button android:id="@+id/button2"

                android:layout_width="wrap_content"

                android:layout_gravity="start"

                android:layout_weight="1"

                android:maxLines="2"

                style="?android:attr/buttonBarButtonStyle"

                android:textSize="14sp"

                android:minHeight="@dimen/alert_dialog_button_bar_height"

                android:layout_height="wrap_content" />

            <Button android:id="@+id/button3"

                android:layout_width="wrap_content"

                android:layout_gravity="center_horizontal"

                android:layout_weight="1"

                android:maxLines="2"

                style="?android:attr/buttonBarButtonStyle"

                android:textSize="14sp"

                android:minHeight="@dimen/alert_dialog_button_bar_height"

                android:layout_height="wrap_content" />

            <Button android:id="@+id/button1"

                android:layout_width="wrap_content"

                android:layout_gravity="end"

                android:layout_weight="1"

                android:maxLines="2"

                android:minHeight="@dimen/alert_dialog_button_bar_height"

                style="?android:attr/buttonBarButtonStyle"

                android:textSize="14sp"

                android:layout_height="wrap_content" />

        </LinearLayout>

     </LinearLayout>

</LinearLayout>

packages/PackageInstaller/res/layout/select_dialog.xml

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* //device/apps/common/res/layout/select_dialog.xml

**

** Copyright 2006, 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.

*/

-->



<!--

    This layout file is used by the AlertDialog when displaying a list of items.

    This layout file is inflated and used as the ListView to display the items.

    Assign an ID so its state will be saved/restored.

-->

<view class="com.android.packageinstaller.AlertController$RecycleListView"

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

    android:id="@+id/select_dialog_listview"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_marginTop="5px"

    android:cacheColorHint="@null"

    android:divider="?android:attr/listDividerAlertDialog"

    android:scrollbars="vertical"

    android:overScrollMode="ifContentScrolls"

    android:textAlignment="viewStart" />

packages/PackageInstaller/res/layout/select_dialog_item.xml

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* //device/apps/common/res/layout/select_dialog_item.xml

**

** Copyright 2006, 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.

*/

-->



<!--

    This layout file is used by the AlertDialog when displaying a list of items.

    This layout file is inflated and used as the TextView to display individual

    items.

-->

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight"

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

    android:textColor="?android:attr/textColorAlertDialogListItem"

    android:gravity="center_vertical"

    android:paddingStart="14dip"

    android:paddingEnd="15dip"

    android:ellipsize="marquee"

/>

packages/PackageInstaller/res/layout/select_dialog_multichoice.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 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.

-->



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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight"

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

    android:textColor="?android:attr/textColorAlertDialogListItem"

    android:gravity="center_vertical"

    android:paddingStart="12dip"

    android:paddingEnd="7dip"

    android:checkMark="?android:attr/listChoiceIndicatorMultiple"

    android:ellipsize="marquee"

/>