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

Commit d48b6ad1 authored by Suprabh Shukla's avatar Suprabh Shukla Committed by android-build-merger
Browse files

Merge "Revert "Using SecureTouchListener for install button during install... 

Merge "Revert "Using SecureTouchListener for install button during install confirmation"" into oc-dev
am: 01a9f8b8

Change-Id: I1e20cdabde352701442025d73fdf5194d5c53ca5
parents f3fde008 01a9f8b8

res/values/strings.xml

+0 −6
Original line number Diff line number Diff line
@@ -334,12 +334,6 @@ 
    <!-- Help URL, application permissions [DO NOT TRANSLATE] -->

    <string name="help_app_permissions" translatable="false"></string>



    <!-- Warning shown when user input has been blocked due to another app overlaying screen

         content. Since we don't know what the app is showing on top of the input target, we

         can't verify user consent. [CHAR LIMIT=NONE] -->

    <string name="window_obscured_warning">Because another app is displaying on top of these options,

        Package Installer can\u2019t respond to your action.</string>



    <!-- Text to show in warning dialog on the tablet when the app source is not trusted [CHAR LIMIT=NONE] -->

    <string name="untrusted_external_source_warning" product="tablet">For your security, your tablet is not allowed to install unknown apps from this source.</string>

src/com/android/packageinstaller/PackageInstallerActivity.java

+0 −4
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ import android.widget.Button; 
import android.widget.TabHost;

import android.widget.TextView;



import com.android.settingslib.SecureTouchListener;



import java.io.File;



/**
@@ -455,8 +453,6 @@ public class PackageInstallerActivity extends Activity implements OnClickListene 


        mOk = (Button) findViewById(R.id.ok_button);

        mCancel = (Button)findViewById(R.id.cancel_button);

        mOk.setOnTouchListener(

                new SecureTouchListener(getString(R.string.window_obscured_warning)));

        mOk.setOnClickListener(this);

        mCancel.setOnClickListener(this);