Update navigation bar UI
- Set right colors for elements
- Hide separator when editing url
- Keep it colored on tabs view
- Make Security state icon smaller
- Update progress bar indicator
- Update incognito colors
Change-Id: I856dd3add116dbc75be64a989983cac7ff814d95
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
diff --git a/res/drawable-hdpi/deco_progress_bar.9.png b/res/drawable-hdpi/deco_progress_bar.9.png
index 821b870..d0d8f91 100644
--- a/res/drawable-hdpi/deco_progress_bar.9.png
+++ b/res/drawable-hdpi/deco_progress_bar.9.png
Binary files differ
diff --git a/res/drawable-mdpi/deco_progress_bar.9.png b/res/drawable-mdpi/deco_progress_bar.9.png
index 4eb5f51..9e14a75 100644
--- a/res/drawable-mdpi/deco_progress_bar.9.png
+++ b/res/drawable-mdpi/deco_progress_bar.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/deco_progress_bar.9.png b/res/drawable-xhdpi/deco_progress_bar.9.png
index 1206ab2..14d6e3a 100644
--- a/res/drawable-xhdpi/deco_progress_bar.9.png
+++ b/res/drawable-xhdpi/deco_progress_bar.9.png
Binary files differ
diff --git a/res/drawable/ic_action_add_incognito.xml b/res/drawable/ic_action_add_incognito.xml
index f3dc09d..aa87d17 100644
--- a/res/drawable/ic_action_add_incognito.xml
+++ b/res/drawable/ic_action_add_incognito.xml
@@ -6,7 +6,7 @@
android:viewportHeight="24">
<path
- android:fillColor="@color/icon_black"
+ android:fillColor="@color/icon_white"
android:pathData="M12 7c2.76 0 5 2.24 5 5 0 .65-.13 1.26-.36 1.83l2.92 2.92c1.51-1.26 2.7-2.89
3.43-4.75-1.73-4.39-6-7.5-11-7.5-1.4 0-2.74 .25 -3.98 .7 l2.16 2.16C10.74 7.13
11.35 7 12 7zM2 4.27l2.28 2.28 .46 .46C3.08 8.3 1.78 10.02 1 12c1.73 4.39 6 7.5
diff --git a/res/drawable/ic_deco_incognito_normal.xml b/res/drawable/ic_deco_incognito_normal.xml
index f3dc09d..aa87d17 100644
--- a/res/drawable/ic_deco_incognito_normal.xml
+++ b/res/drawable/ic_deco_incognito_normal.xml
@@ -6,7 +6,7 @@
android:viewportHeight="24">
<path
- android:fillColor="@color/icon_black"
+ android:fillColor="@color/icon_white"
android:pathData="M12 7c2.76 0 5 2.24 5 5 0 .65-.13 1.26-.36 1.83l2.92 2.92c1.51-1.26 2.7-2.89
3.43-4.75-1.73-4.39-6-7.5-11-7.5-1.4 0-2.74 .25 -3.98 .7 l2.16 2.16C10.74 7.13
11.35 7 12 7zM2 4.27l2.28 2.28 .46 .46C3.08 8.3 1.78 10.02 1 12c1.73 4.39 6 7.5
diff --git a/res/drawable/img_deco_tile_avoid.xml b/res/drawable/img_deco_tile_avoid.xml
index 34c194a..ac9c32d 100644
--- a/res/drawable/img_deco_tile_avoid.xml
+++ b/res/drawable/img_deco_tile_avoid.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
+ android:width="18dp"
+ android:height="18dp"
android:viewportWidth="24"
android:viewportHeight="24">
diff --git a/res/drawable/img_deco_tile_avoid_accent.xml b/res/drawable/img_deco_tile_avoid_accent.xml
index 56e3beb..6083bef 100644
--- a/res/drawable/img_deco_tile_avoid_accent.xml
+++ b/res/drawable/img_deco_tile_avoid_accent.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
+ android:width="18dp"
+ android:height="18dp"
android:viewportWidth="24"
android:viewportHeight="24">
diff --git a/res/drawable/img_deco_tile_unknown.xml b/res/drawable/img_deco_tile_unknown.xml
index b36a345..08458be 100644
--- a/res/drawable/img_deco_tile_unknown.xml
+++ b/res/drawable/img_deco_tile_unknown.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
+ android:width="18dp"
+ android:height="18dp"
android:viewportWidth="24"
android:viewportHeight="24">
diff --git a/res/drawable/img_deco_tile_untrusted.xml b/res/drawable/img_deco_tile_untrusted.xml
index f605fb1..fe06ae3 100644
--- a/res/drawable/img_deco_tile_untrusted.xml
+++ b/res/drawable/img_deco_tile_untrusted.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
+ android:width="18dp"
+ android:height="18dp"
android:viewportWidth="24"
android:viewportHeight="24">
diff --git a/res/drawable/img_deco_tile_verified.xml b/res/drawable/img_deco_tile_verified.xml
index 4fb5b9b..4601cbb 100644
--- a/res/drawable/img_deco_tile_verified.xml
+++ b/res/drawable/img_deco_tile_verified.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
+ android:width="18dp"
+ android:height="18dp"
android:viewportWidth="24"
android:viewportHeight="24">
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index 6e75aee..1f17a54 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -30,7 +30,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height"
- android:background="@color/trasparent"
+ android:background="@color/primary"
android:gravity="end"
android:orientation="horizontal">
@@ -60,14 +60,14 @@
<ImageButton
android:id="@+id/more"
- style="@style/OverflowButton" />
+ style="@style/OverflowButtonInverted" />
</LinearLayout>
- <!-- Cosmetic shadow (covered by anim_screen during transitions) >
+ <!-- Cosmetic shadow (covered by anim_screen during transitions) -->
<View
android:layout_width="match_parent"
android:layout_height="8dp"
android:layout_marginTop="@dimen/toolbar_height"
- android:background="@drawable/deco_cosmetic_topshadow" /-->
+ android:background="@drawable/deco_cosmetic_topshadow" />
</FrameLayout>
diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml
index 1bf4b8d..6c475e1 100644
--- a/res/layout/nav_tab_view.xml
+++ b/res/layout/nav_tab_view.xml
@@ -56,8 +56,8 @@
android:textAppearance="?android:attr/textAppearanceSmallInverse" />
</LinearLayout>
</LinearLayout>
- <FrameLayout
+ <!--FrameLayout
android:layout_width="match_parent"
- android:layout_height="50dp"
- android:background="@color/trasparent" />
+ android:layout_height="48dp"
+ android:background="@color/trasparent" /-->
</LinearLayout>
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index b5f865b..1e0c389 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -48,13 +48,14 @@
<!-- Cosmetic separator -->
<View
+ android:id="@+id/separator"
android:layout_width="1dp"
- android:layout_height="42dp"
- android:paddingTop="4dp"
- android:paddingBottom="4dp"
- android:paddingEnd="2dp"
- android:background="#55FAFAFA" />
-
+ android:layout_height="36dp"
+ android:paddingTop="6dp"
+ android:paddingBottom="6dp"
+ android:paddingStart="4dp"
+ android:paddingEnd="4dp"
+ android:background="@color/icon_white" />
<ImageView
android:id="@+id/stop"
@@ -103,7 +104,7 @@
style="@style/NavButton"
android:layout_width="wrap_content"
android:contentDescription="@string/accessibility_button_clear"
- android:src="@drawable/ic_action_stop"
+ android:src="@drawable/ic_action_stop_normal_inverted"
android:visibility="gone" />
</LinearLayout>
@@ -125,6 +126,7 @@
android:layout_gravity="center"
android:clickable="false"
android:paddingBottom="1dp"
+ android:paddingStart="1dp"
android:paddingEnd="1dp"
android:textColor="@color/white"
android:textSize="13dp"
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index 0fce72c..d5dd32b 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -68,6 +68,8 @@
</style>
<style name="Widget.UrlInputView" parent="BrowserTheme">
<item name="android:colorAccent">@color/white</item>
+ <item name="android:textColor">@color/icon_white</item>
+ <item name="android:textColorHint">@color/icon_white</item>
</style>
<style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Material.Medium" />
<style name="TextAppearance.Small" parent="@android:style/TextAppearance.Material.Small" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 3f325d0..9adb57c 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,11 +19,6 @@
<!-- fundamental colors -->
<color name="white">#fafafa</color>
<color name="black">#14181C</color>
- <color name="red">#f44336</color>
- <color name="yellow">#ffc107</color>
- <color name="green">#4caf50</color>
- <color name="blue">#2196F3</color>
-
<color name="trasparent">#ffffffff</color>
<!-- chrome colors -->
@@ -44,7 +39,7 @@
<!-- derived colors -->
<color name="NavigationBarBackground">@color/primary</color>
- <color name="NavigationBarBackgroundIncognito">#5A5A5A</color>
+ <color name="NavigationBarBackgroundIncognito">@color/black</color>
<color name="PopupBackground">@color/white</color>
<color name="TabNavBackgroundColor">@color/white</color>
<color name="TabPassiveMessageBackground">#f2f2f2</color>
diff --git a/src/com/android/browser/NavigationBarBase.java b/src/com/android/browser/NavigationBarBase.java
index 5591558..90b551b 100644
--- a/src/com/android/browser/NavigationBarBase.java
+++ b/src/com/android/browser/NavigationBarBase.java
@@ -76,6 +76,7 @@
protected ImageView mStopButton;
private SiteTileView mFaviconTile;
+ private View mSeparator;
private View mVoiceButton;
private ImageView mClearButton;
private View mMore;
@@ -121,6 +122,7 @@
mUrlInput.addTextChangedListener(this);
mMore = findViewById(R.id.more_browser_settings);
mMore.setOnClickListener(this);
+ mSeparator = findViewById(R.id.separator);
mFaviconTile = (SiteTileView) findViewById(R.id.favicon_view);
mFaviconTile.setOnClickListener(this);
mVoiceButton = findViewById(R.id.voice);
@@ -755,6 +757,7 @@
switch(state) {
case STATE_NORMAL:
mFaviconTile.setVisibility(View.VISIBLE);
+ mSeparator.setVisibility(View.VISIBLE);
mMore.setVisibility(View.VISIBLE);
if (mUiController != null) {
Tab currentTab = mUiController.getCurrentTab();
@@ -770,6 +773,7 @@
break;
case STATE_HIGHLIGHTED:
mFaviconTile.setVisibility(View.GONE);
+ mSeparator.setVisibility(View.GONE);
mClearButton.setVisibility(View.VISIBLE);
mMore.setVisibility(View.GONE);
if (mUiController != null) {
diff --git a/src/gello/res/values/about.xml b/src/gello/res/values/about.xml
new file mode 100644
index 0000000..608619b
--- /dev/null
+++ b/src/gello/res/values/about.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Text to display in about dialog -->
+<string name="about_text" formatted="false">
+
+Version: 42.0.2311.187027\n
+Built: Tue Sep 8 14:58:47 CEST 2015\n
+Host: envy-linux\n
+User: joey\n
+Hash: ede7d44 (2311)\n
+</string>
+</resources>
