Fixed issue for adding bookmarks to a new folder

-  The browser was crashing when user tried to add a bookmark
   to a new folder. The folder was created using folder selector
   UI on "add bookmark" dialog page.

-  If user rotates screen while creating a new folder
   to add bookmark, the keyboard was not getting
   dismissed. It caused an overlay on top of the folder
   selector. The user had to manually dismiss the keyboard.

Change-Id: I5f2dbf6e00ab0a1d5b98bf72a04317c04ac0549a

3 files changed, 4 insertions, 2 deletions

diff --git a/src/res/layout/new_folder_layout.xml b/src/res/layout/new_folder_layout.xml
index 3ffa7911..85deee18 100644
--- a/src/res/layout/new_folder_layout.xml
+++ b/src/res/layout/new_folder_layout.xml
@@ -30,7 +30,6 @@
   <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="@*android:drawable/edit_text_holo_dark"
       android:gravity="center_vertical"
       android:paddingBottom="5dip"
       android:orientation="horizontal">
diff --git a/src/src/com/android/browser/AddBookmarkPage.java b/src/src/com/android/browser/AddBookmarkPage.java
index 860e00a2..00b892ab 100644
--- a/src/src/com/android/browser/AddBookmarkPage.java
+++ b/src/src/com/android/browser/AddBookmarkPage.java
@@ -351,6 +351,8 @@ public class AddBookmarkPage extends Activity
                 mSaveToHomeScreen = true;
                 break;
             case FolderSpinnerAdapter.OTHER_FOLDER:
+                setupTopCrumb();
+                getLoaderManager().restartLoader(LOADER_ID_FOLDER_CONTENTS, null, this);
                 switchToFolderSelector();
                 break;
             case FolderSpinnerAdapter.RECENT_FOLDER:
@@ -382,7 +384,7 @@ public class AddBookmarkPage extends Activity
         mAddNewFolder.setVisibility(View.VISIBLE);
         mAddSeparator.setVisibility(View.VISIBLE);
         getInputMethodManager().hideSoftInputFromWindow(
-                mListView.getWindowToken(), 0);
+                mFolderNamer.getWindowToken(), 0);
     }
 
     private long addFolderToCurrent(String name) {
diff --git a/src/src/com/android/browser/BrowserYesNoPreference.java b/src/src/com/android/browser/BrowserYesNoPreference.java
index d73ea08b..eae9a8b8 100644
--- a/src/src/com/android/browser/BrowserYesNoPreference.java
+++ b/src/src/com/android/browser/BrowserYesNoPreference.java
@@ -50,6 +50,7 @@ public class BrowserYesNoPreference extends DialogPreference {
         mNeutralBtnTxt = a.getString(R.styleable.BrowserYesNoPreference_neutralButtonText);
         mPositiveBtnTxt = a.getString(R.styleable.BrowserYesNoPreference_positiveButtonText);
         mNegativeBtnTxt = a.getString(R.styleable.BrowserYesNoPreference_negativeButtonText);
+        setDialogIcon(R.drawable.ic_sp_level_warning);
     }
 
     @Override