Add a basic account picker to the bookmarks picker
The account picker only shows up when you
have multiple accounts providing bookmarks.
Change-Id: I341d37d81551ca571713ac66d564c9cb0a86653c
diff --git a/res/layout/bookmarks.xml b/res/layout/bookmarks.xml
index e3e4a9d..f5c9331 100644
--- a/res/layout/bookmarks.xml
+++ b/res/layout/bookmarks.xml
@@ -24,11 +24,30 @@
android:layout_height="match_parent"
android:orientation="vertical"
>
- <Button android:id="@+id/up"
- android:layout_width="wrap_content"
+
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/defaultBookmarksUpButton"
- />
+ android:orientation="horizontal"
+ >
+ <Button android:id="@+id/up"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/defaultBookmarksUpButton"
+ />
+
+ <!-- space -->
+ <View
+ android:layout_width="0dip"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ />
+
+ <Spinner android:id="@+id/accounts"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ />
+ </LinearLayout>
<GridView android:id="@+id/grid"
android:layout_width="match_parent"
@@ -52,7 +71,7 @@
android:layout_gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge"
- android:text="@string/empty_history"
+ android:text="@string/empty_bookmarks_folder"
android:visibility="gone"
/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1d21fc8..cbd9bbc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -741,9 +741,13 @@
<string name="error_console_eval_button_text" translatable="false">Evaluate</string>
<!-- The default state to the "up to parent folder" button in the bookmarks UI. This
- is displayed when the user is at the highest level and cannot go up -->
+ is displayed when the user is at the highest level and cannot go up [CHAR LIMIT=16] -->
<string name="defaultBookmarksUpButton">Bookmarks</string>
+ <!-- The string that is displayed when there are no bookmarks to display.
+ This is centered in the middle of the screen [CHAR LIMIT=NONE] -->
+ <string name="empty_bookmarks_folder">There are no bookmarks</string>
+
<!-- Access point for RLZ tracking. -->
<string name="rlz_access_point">Y1</string>