From 8c377a5e03f85e0e0444ad7ef48a4ef2e0e3dd25 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Wed, 16 Dec 2015 22:03:13 -0800
Subject: [PATCH] Back out 3 changesets (bug 1220309) for 2.3 robocop bustage
 in testPrivateBrowsing and testSessionHistory CLOSED TREE

Backed out changeset 1cf6f364d319 (bug 1220309)
Backed out changeset f774157cf5f4 (bug 1220309)
Backed out changeset bd4581fe6c9d (bug 1220309)
---
 .../android/base/java/org/mozilla/gecko/GeckoActivity.java   | 4 ++--
 mobile/android/base/moz.build                                | 3 +--
 mobile/android/base/resources/values/styles.xml              | 3 ---
 mobile/android/tests/browser/robocop/Makefile.in             | 5 -----
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoActivity.java b/mobile/android/base/java/org/mozilla/gecko/GeckoActivity.java
index cf1adb380215..9866dd057349 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoActivity.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoActivity.java
@@ -6,9 +6,9 @@ package org.mozilla.gecko;
 
 import android.content.ComponentName;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import android.support.v4.app.FragmentActivity;
 
-public class GeckoActivity extends AppCompatActivity implements GeckoActivityStatus {
+public class GeckoActivity extends FragmentActivity implements GeckoActivityStatus {
     // has this activity recently started another Gecko activity?
     private boolean mGeckoActivityOpened;
 
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 43bb193b786f..a6bf84df08f8 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -31,14 +31,13 @@ constants_jar.extra_jars = [
     CONFIG['ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB'],
     CONFIG['ANDROID_SUPPORT_V4_AAR_LIB'],
     CONFIG['ANDROID_SUPPORT_V4_AAR_INTERNAL_LIB'],
-    CONFIG['ANDROID_APPCOMPAT_V7_AAR_LIB'],
 ]
 
 if CONFIG['MOZ_INSTALL_TRACKING']:
     constants_jar.sources += ['java/org/mozilla/gecko/' + x for x in [
         'adjust/AdjustHelper.java',
     ]]
-    constants_jar.extra_jars += [
+    constants_jar.extra_jars = [
         'gecko-thirdparty-adjust_sdk.jar',
     ]
 else:
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index 6f4a64fb60cf..4fe9f26a72a6 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -841,9 +841,6 @@
         <item name="android:paddingBottom">16dp</item>
         <item name="android:paddingLeft">8dp</item>
         <item name="android:paddingRight">8dp</item>
-
-        <!-- AppCompat sets Button text to all caps so we override that here. -->
-        <item name="textAllCaps">false</item>
     </style>
 
     <style name="TabQueueActivity" parent="android:style/Theme.NoDisplay" />
diff --git a/mobile/android/tests/browser/robocop/Makefile.in b/mobile/android/tests/browser/robocop/Makefile.in
index 5f520768781b..29818a9b2ed2 100644
--- a/mobile/android/tests/browser/robocop/Makefile.in
+++ b/mobile/android/tests/browser/robocop/Makefile.in
@@ -65,12 +65,7 @@ stumbler_jars_dir := $(DEPTH)/mobile/android/stumbler
 ANDROID_CLASSPATH_JARS += \
   $(wildcard $(jars_dir)/*.jar) \
   $(wildcard $(stumbler_jars_dir)/*.jar) \
-  $(NULL)
-# We don't have transitive dependencies: these are the browser jar
-# dependencies inserted manually.
-ANDROID_CLASSPATH_JARS += \
   $(ANDROID_SUPPORT_V4_AAR_LIB) \
   $(ANDROID_SUPPORT_V4_AAR_INTERNAL_LIB) \
   $(ANDROID_RECYCLERVIEW_V7_AAR_LIB) \
-  $(ANDROID_APPCOMPAT_V7_AAR_LIB) \
   $(NULL)