Bug 1147265 - Backout changeset 81fd15f15c65.
authorMichael Comella <michael.l.comella@gmail.com>
Wed, 05 Aug 2015 17:06:35 -0700
changeset 288079 1c2dfa848d83c5b9521a9fcd3493718dd11ba187
parent 288078 20b782a2f08d45401d782ab0b59daafb84d1abce
child 288080 a8dbc50c600d4b66ee2930d871d2d9e59b0407e0
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1147265
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1147265 - Backout changeset 81fd15f15c65.
mobile/android/base/AndroidManifest.xml.in
mobile/android/base/resources/values/themes.xml
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -3,17 +3,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="@ANDROID_PACKAGE_NAME@"
       android:installLocation="auto"
       android:versionCode="@ANDROID_VERSION_CODE@"
       android:versionName="@MOZ_APP_VERSION@"
 #ifdef MOZ_ANDROID_SHARED_ID
       android:sharedUserId="@MOZ_ANDROID_SHARED_ID@"
 #endif
-      android:theme="@style/FilteredTouches"
       >
     <uses-sdk android:minSdkVersion="@MOZ_ANDROID_MIN_SDK_VERSION@"
 #ifdef MOZ_ANDROID_MAX_SDK_VERSION
               android:maxSdkVersion="@MOZ_ANDROID_MAX_SDK_VERSION@"
 #endif
               android:targetSdkVersion="@ANDROID_TARGET_SDK@"/>
 
 #include ../services/manifests/FxAccountAndroidManifest_permissions.xml.in
--- a/mobile/android/base/resources/values/themes.xml
+++ b/mobile/android/base/resources/values/themes.xml
@@ -1,24 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <resources>
 
-    <!-- Bug 1147265: to prevent tap jacking, we should set
-         filterTouchesWhenObscured=true for all activities. This theme
-         should be used when there is no other relevant theme for the
-         Activity. Note: it may be helpful to inherit from a base
-         Android theme (i.e. what GeckoBase inherits from). -->
-    <style name="FilteredTouches">
-        <item name="android:filterTouchesWhenObscured">true</item>
-    </style>
-
     <!--
         Base application theme. This could be overridden by GeckoBaseTheme
         in other res/values-XXX/themes.xml.
     -->
     <style name="GeckoBase" parent="@android:style/Theme.Light">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowContentOverlay">@null</item>
     </style>