diff options
| author | Suprabh Shukla <suprabh@google.com> | 2017-05-26 01:31:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-26 01:31:30 +0000 |
| commit | eb4e91ed19312c4e3d01104f9682a53d850db6b2 (patch) | |
| tree | 07d7bb9657d45adc75b3f2dd3f814f4f25794aa5 | |
| parent | f07a453e331bfa48dc96aca00e74cbf4fcd1c1ed (diff) | |
| parent | d48b6ad1ac56e00d24065b7e044ffa2b26837445 (diff) | |
| download | android_packages_apps_PackageInstaller-eb4e91ed19312c4e3d01104f9682a53d850db6b2.tar.gz android_packages_apps_PackageInstaller-eb4e91ed19312c4e3d01104f9682a53d850db6b2.tar.bz2 android_packages_apps_PackageInstaller-eb4e91ed19312c4e3d01104f9682a53d850db6b2.zip | |
Merge "Revert "Using SecureTouchListener for install button during install confirmation"" into oc-dev am: 01a9f8b8a9
am: d48b6ad1ac
Change-Id: Id7291c57f4a2bf54450c54fbde11de3996c979d1
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | src/com/android/packageinstaller/PackageInstallerActivity.java | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index f59f8159..9992a41f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -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> diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index 558a8c9b..4d33a3af 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -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); |