diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-11 14:22:52 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-11 14:22:52 -0400 |
| commit | 9f79346da9f52970cd299c78b11917e069507ebb (patch) | |
| tree | 3b1d29004af04fc6260a3c0383000df61e8b7fd0 | |
| parent | 1ec74f76e629980e58a2d316b3b9ab1b1c26f446 (diff) | |
| parent | b17d2ebfb249342541bf3c57ecb60eb81dc82739 (diff) | |
| download | packages_apps_browser-9f79346da9f52970cd299c78b11917e069507ebb.zip packages_apps_browser-9f79346da9f52970cd299c78b11917e069507ebb.tar.gz packages_apps_browser-9f79346da9f52970cd299c78b11917e069507ebb.tar.bz2 | |
Merge change 24688 into eclair
* changes:
Adjustments for the look of the tab page.
| -rw-r--r-- | res/layout/tab_view.xml | 18 | ||||
| -rw-r--r-- | src/com/android/browser/ActiveTabsPage.java | 6 |
2 files changed, 18 insertions, 6 deletions
diff --git a/res/layout/tab_view.xml b/res/layout/tab_view.xml index 8f42937..167621e 100644 --- a/res/layout/tab_view.xml +++ b/res/layout/tab_view.xml @@ -24,8 +24,8 @@ <com.android.browser.FakeWebView android:id="@+id/screen_shot" android:layout_width="40dip" android:layout_height="40dip" - android:layout_marginLeft="4dip" - android:layout_marginRight="4dip" + android:layout_marginLeft="8dip" + android:layout_marginRight="8dip" /> <LinearLayout android:layout_width="0dip" @@ -50,11 +50,19 @@ android:ellipsize="end" /> </LinearLayout> + <View android:id="@+id/divider" + android:background="#ff313431" + android:layout_width="1dip" + android:layout_height="fill_parent" + android:layout_marginLeft="8dip" + android:layout_marginTop="5dip" + android:layout_marginBottom="5dip" + /> <ImageView android:id="@+id/close" - android:src="@drawable/ic_close_tab" + android:src="@drawable/ic_btn_close_panel" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="4dip" - android:layout_marginRight="4dip" + android:layout_marginLeft="8dip" + android:layout_marginRight="8dip" /> </LinearLayout> diff --git a/src/com/android/browser/ActiveTabsPage.java b/src/com/android/browser/ActiveTabsPage.java index c1b402a..9837ad6 100644 --- a/src/com/android/browser/ActiveTabsPage.java +++ b/src/com/android/browser/ActiveTabsPage.java @@ -97,6 +97,7 @@ public class ActiveTabsPage extends LinearLayout { FakeWebView webView = (FakeWebView) convertView.findViewById(R.id.screen_shot); View close = convertView.findViewById(R.id.close); + View divider = convertView.findViewById(R.id.divider); final int tabCount = mControl.getTabCount(); if (tabCount < TabControl.MAX_TABS) { @@ -104,15 +105,18 @@ public class ActiveTabsPage extends LinearLayout { } if (position == -1) { title.setText(R.string.new_tab); - url.setText(R.string.http); + url.setVisibility(View.GONE); webView.setImageResource(R.drawable.ic_add_tab); close.setVisibility(View.GONE); + divider.setVisibility(View.GONE); } else { TabControl.Tab tab = mControl.getTab(position); mControl.populatePickerData(tab); title.setText(tab.getTitle()); url.setText(tab.getUrl()); + url.setVisibility(View.VISIBLE); webView.setTab(tab); + divider.setVisibility(View.VISIBLE); close.setVisibility(View.VISIBLE); final int closePosition = position; close.setOnClickListener(new View.OnClickListener() { |