diff options
| author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-22 03:09:11 +0000 |
|---|---|---|
| committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-22 03:09:11 +0000 |
| commit | 8aa733f378aa219140c48e6fc3dd7f41fb003031 (patch) | |
| tree | febbc9d73e1963c928d9dd58fbea1ebdc1cc889a /remoting/resources | |
| parent | c2ca3fd18959ff2b7d7a4d1ad5f39d0dc3a61070 (diff) | |
| download | chromium_src-8aa733f378aa219140c48e6fc3dd7f41fb003031.zip chromium_src-8aa733f378aa219140c48e6fc3dd7f41fb003031.tar.gz chromium_src-8aa733f378aa219140c48e6fc3dd7f41fb003031.tar.bz2 | |
Move "My Computers" header into action-bar, replacing Chromoting title.
Also refactored to use ListView.setEmptyView() to show
the empty state when there are no hosts.
NOTRY=true
Review URL: https://codereview.chromium.org/207543002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/resources')
| -rw-r--r-- | remoting/resources/android/layout/account_selected.xml | 2 | ||||
| -rw-r--r-- | remoting/resources/android/layout/main.xml | 17 |
2 files changed, 8 insertions, 11 deletions
diff --git a/remoting/resources/android/layout/account_selected.xml b/remoting/resources/android/layout/account_selected.xml index cbf523a..5eae097 100644 --- a/remoting/resources/android/layout/account_selected.xml +++ b/remoting/resources/android/layout/account_selected.xml @@ -15,7 +15,7 @@ android:layout_marginTop="@dimen/action_bar_title_top_margin" android:singleLine="true" android:ellipsize="end" - android:text="@string/product_name" + android:text="@string/mode_me2me" android:textAppearance="?android:attr/textAppearanceMedium" android:textSize="@dimen/action_bar_title_text_size"/> <TextView android:id="@+id/account_name" diff --git a/remoting/resources/android/layout/main.xml b/remoting/resources/android/layout/main.xml index 25a958b..b3a6754 100644 --- a/remoting/resources/android/layout/main.xml +++ b/remoting/resources/android/layout/main.xml @@ -8,17 +8,14 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="match_parent" android:layout_width="match_parent"> - <LinearLayout android:id="@+id/hostList_main" - android:orientation="vertical" + <ListView android:id="@+id/hostList_chooser" android:layout_height="match_parent" - android:layout_width="match_parent"> - <TextView android:id="@+id/hostList_greeting" - android:layout_height="wrap_content" - android:layout_width="match_parent"/> - <ListView android:id="@+id/hostList_chooser" - android:layout_height="match_parent" - android:layout_width="match_parent"/> - </LinearLayout> + android:layout_width="match_parent"/> + <TextView android:id="@+id/hostList_empty" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:text="@string/host_list_empty_android" + android:visibility="gone"/> <ProgressBar android:id="@+id/hostList_progress" android:layout_height="wrap_content" android:layout_width="wrap_content" |