Bug 696846 - Use default system theme except on GeckoSurfaceView. r=blassey

embedding/android/GeckoSurfaceView.java

@@ -74,13 +74,13 @@ class GeckoSurfaceView
     private static final String LOG_FILE_NAME = "GeckoSurfaceView";
 
     public GeckoSurfaceView(Context context) {
-        super(context);
+        super(context, null, android.R.style.Theme_Light_NoTitleBar);
 
         getHolder().addCallback(this);
         inputConnection = new GeckoInputConnection(this);
         setFocusable(true);
         setFocusableInTouchMode(true);
-        
+
         DisplayMetrics metrics = new DisplayMetrics();
         GeckoApp.mAppContext.getWindowManager().
             getDefaultDisplay().getMetrics(metrics);

embedding/android/Makefile.in

@@ -149,7 +149,6 @@ RES_LAYOUT = \
   res/layout/bookmark_list_row.xml \
   res/layout/tabs_tray.xml \
   res/layout/tabs_row.xml \
-  res/layout/dialog_checkbox.xml \
   res/layout/doorhangerpopup.xml \
   $(NULL)
 

embedding/android/PromptService.java

@@ -47,6 +47,7 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.view.View;
 import android.view.LayoutInflater;
+import android.view.ViewGroup.LayoutParams;
 import android.widget.TextView;
 import android.widget.CheckBox;
 import android.widget.EditText;
@@ -98,9 +99,9 @@ public class PromptService implements OnClickListener, OnCancelListener {
         }
 
         public View getView() {
-            LayoutInflater inflater = GeckoApp.mAppContext.getLayoutInflater();
             if (type.equals("checkbox")) {
-                CheckBox checkbox = (CheckBox) inflater.inflate(R.layout.dialog_checkbox, null);
+                CheckBox checkbox = new CheckBox(GeckoApp.mAppContext);
+                checkbox.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
                 checkbox.setText(label);
                 try {
                     Boolean value = mJSONInput.getBoolean("checked");

embedding/android/resources/layout/dialog_checkbox.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
-          android:id="@+id/checkbox"
-          android:textAppearance="?android:attr/textAppearanceMediumInverse"/>

embedding/android/resources/values/themes.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="GreyTheme" parent="@android:style/Theme.Light.NoTitleBar">
+    <style name="GreyTheme" parent="@android:style/Theme.NoTitleBar">
         <item name="android:windowBackground">@color/splash_background</item>
     </style>