BearND has uploaded a new change for review. https://gerrit.wikimedia.org/r/175115
Change subject: Remove W logo icon ...................................................................... Remove W logo icon Change-Id: I127e103f16f6f424bbba2bb9b20c3d9c20edc966 --- D icon-svgs/32/search_w.noflip.svg M wikipedia/AndroidManifest.xml D wikipedia/res/drawable-hdpi/search_w.png D wikipedia/res/drawable-ldpi/search_w.png D wikipedia/res/drawable-mdpi/search_w.png D wikipedia/res/drawable-xhdpi/search_w.png D wikipedia/res/drawable-xxhdpi/search_w.png M wikipedia/res/layout/activity_main.xml M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java 9 files changed, 1 insertion(+), 33 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/15/175115/1 diff --git a/icon-svgs/32/search_w.noflip.svg b/icon-svgs/32/search_w.noflip.svg deleted file mode 100644 index 52676cd..0000000 --- a/icon-svgs/32/search_w.noflip.svg +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" - width="80px" height="80px" viewBox="0 0 80 80" enable-background="new 0 0 80 80" xml:space="preserve"> -<g> - <g> - <path fill="#231F20" d="M44.577,15.773c1.985,0.075,4.119,0.147,5.81,0.147c1.692,0,3.53-0.072,5.368-0.147 - c0.44,0.442,0.44,1.985,0,2.427c-3.823,0.588-5.443,3.382-7.229,6.837l-5.375,10.227l9.404,19.478h0.339l13.962-30.219 - c1.742-3.978,1.616-5.957-3.162-6.323c-0.44-0.442-0.44-1.985,0-2.427c2.722,0.075,5.588,0.147,7.281,0.147 - c1.689,0,4.115-0.072,6.469-0.147c0.439,0.442,0.439,1.985,0,2.427c-4.19,0.44-5.596,3.315-7.229,6.837L52.812,62.535 - c-0.514,1.104-0.954,1.691-1.763,1.691c-0.737,0-1.301-0.596-1.691-1.691L39.47,41.191L28.624,62.535 - c-0.442,1.104-0.957,1.691-1.766,1.691c-0.734,0-1.248-0.588-1.69-1.691L9.177,24.89c-2.243-5.22-2.779-6.419-6.582-6.69 - c-0.44-0.442-0.514-1.985-0.073-2.427c2.573,0.075,5.199,0.147,7.647,0.147c2.228,0,5.221-0.072,8.161-0.147 - c0.44,0.442,0.44,1.985,0,2.427c-4.633,0.514-4.853,1.69-2.986,5.882l13.465,30.66h0.336l8.213-16.706L31.161,24.89 - c-2.463-5.22-3.051-6.25-6.213-6.69c-0.443-0.442-0.516-1.985-0.074-2.427c2.131,0.075,4.39,0.147,6.542,0.147 - c2.331,0,4.559-0.072,6.692-0.147c0.44,0.442,0.44,1.985,0,2.427c-3.088,0.44-2.795,1.69-0.781,5.882l3.619,7.426l0.323,0.33 - l3.896-7.315c2.278-4.264,2.573-5.883-0.59-6.323C44.137,17.758,44.137,16.215,44.577,15.773z"/> - </g> -</g> -</svg> diff --git a/wikipedia/AndroidManifest.xml b/wikipedia/AndroidManifest.xml index f161afb..7e0e7c8 100644 --- a/wikipedia/AndroidManifest.xml +++ b/wikipedia/AndroidManifest.xml @@ -30,7 +30,6 @@ android:allowBackup="true" android:supportsRtl="true" android:icon="@drawable/launcher" - android:logo="@drawable/search_w" android:label="@string/app_name" android:name=".WikipediaApp" android:theme="@style/AppTheme"> diff --git a/wikipedia/res/drawable-hdpi/search_w.png b/wikipedia/res/drawable-hdpi/search_w.png deleted file mode 100644 index 7ceb58e..0000000 --- a/wikipedia/res/drawable-hdpi/search_w.png +++ /dev/null Binary files differ diff --git a/wikipedia/res/drawable-ldpi/search_w.png b/wikipedia/res/drawable-ldpi/search_w.png deleted file mode 100644 index e610d32..0000000 --- a/wikipedia/res/drawable-ldpi/search_w.png +++ /dev/null Binary files differ diff --git a/wikipedia/res/drawable-mdpi/search_w.png b/wikipedia/res/drawable-mdpi/search_w.png deleted file mode 100644 index c2f178c..0000000 --- a/wikipedia/res/drawable-mdpi/search_w.png +++ /dev/null Binary files differ diff --git a/wikipedia/res/drawable-xhdpi/search_w.png b/wikipedia/res/drawable-xhdpi/search_w.png deleted file mode 100644 index 4f79534..0000000 --- a/wikipedia/res/drawable-xhdpi/search_w.png +++ /dev/null Binary files differ diff --git a/wikipedia/res/drawable-xxhdpi/search_w.png b/wikipedia/res/drawable-xxhdpi/search_w.png deleted file mode 100644 index 7108665..0000000 --- a/wikipedia/res/drawable-xxhdpi/search_w.png +++ /dev/null Binary files differ diff --git a/wikipedia/res/layout/activity_main.xml b/wikipedia/res/layout/activity_main.xml index 640c00d..dff9a4a 100644 --- a/wikipedia/res/layout/activity_main.xml +++ b/wikipedia/res/layout/activity_main.xml @@ -42,14 +42,7 @@ <android.support.v7.widget.Toolbar android:id="@+id/main_toolbar" android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize"> - <View - android:id="@+id/main_w_logo" - android:layout_width="32dp" - android:layout_height="32dp" - android:background="@drawable/search_w" - android:alpha="0.5"/> - </android.support.v7.widget.Toolbar> + android:layout_height="?attr/actionBarSize"/> <ProgressBar android:id="@+id/main_progressbar" android:layout_width="match_parent" diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java index be8c67e..bc8e4a7 100644 --- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java +++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java @@ -288,9 +288,6 @@ getMenuInflater().inflate(R.menu.menu_main, menu); app.adjustDrawableToTheme(menu.findItem(R.id.menu_search).getIcon()); } - View wLogo = findViewById(R.id.main_w_logo); - app.adjustDrawableToTheme(wLogo.getBackground()); - wLogo.setVisibility(isSearching() ? View.GONE : View.VISIBLE); return super.onCreateOptionsMenu(menu); } -- To view, visit https://gerrit.wikimedia.org/r/175115 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I127e103f16f6f424bbba2bb9b20c3d9c20edc966 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: BearND <bsitzm...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
