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

Commit 10e541c6 authored by Sumedh Sen's avatar Sumedh Sen
Browse files

Make confirmation message scroll 

In case the dialog message in install/uninstall confirmation dialog is long, it
may get clipped if the device is in landscape mode, screen is small or
font is large. Ensure that the dialog message is scrollable

Bug: 316211161
Test: Manual. Follow repro steps in the bug
Change-Id: I244d98675d506cbf360698bcaa7e59f0245050d6
parent 230a6ecb

packages/PackageInstaller/res/layout/install_content_view.xml

+97 −95
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ 
      android:layout_height="wrap_content"

      style="@android:style/TextAppearance.Material.Subhead"

      android:text="@string/install_confirm_question"

        android:visibility="invisible" />

      android:visibility="invisible"

      android:scrollbars="vertical" />



  <TextView

      android:id="@+id/install_confirm_question_update"
@@ -84,7 +85,8 @@ 
      android:layout_height="wrap_content"

      style="@android:style/TextAppearance.Material.Subhead"

      android:text="@string/install_confirm_question_update"

        android:visibility="invisible" />

      android:visibility="invisible"

      android:scrollbars="vertical" />



  <TextView

      android:id="@+id/install_success"

packages/PackageInstaller/res/layout/uninstall_content_view.xml

+29 −24
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ 
<!-- Check box that is displayed in the activity resolver UI for the user

     to make their selection the preferred activity. -->



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

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



  <LinearLayout

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

      android:layout_width="match_parent"
@@ -46,3 +50,4 @@ 
          style="@android:style/TextAppearance.Material.Subhead" />



  </LinearLayout>

</ScrollView>

packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import android.provider.Settings; 
import android.text.Html;

import android.text.Spanned;

import android.text.TextUtils;

import android.text.method.ScrollingMovementMethod;

import android.util.Log;

import android.view.View;

import android.widget.Button;
@@ -174,6 +175,7 @@ public class PackageInstallerActivity extends Activity { 
        }



        viewToEnable.setVisibility(View.VISIBLE);

        viewToEnable.setMovementMethod(new ScrollingMovementMethod());



        mEnableOk = true;

        mOk.setEnabled(true);