summaryrefslogtreecommitdiffstats
path: root/app/src/main
diff options
context:
space:
mode:
authorGabriel FĂ©ron <feron.gabriel@gmail.com>2017-05-31 08:21:35 +0200
committerDanny Baumann <dannybaumann@web.de>2017-05-31 08:38:52 +0200
commit837ec77d439912d9e54f613326adbbaea4d316c4 (patch)
treec67a5b43dd9560f73ccf1c99c05f50fc06467f95 /app/src/main
parentc35cc240cc1f572ef658afb7947269cf23406225 (diff)
downloadandroid_packages_apps_Jelly-837ec77d439912d9e54f613326adbbaea4d316c4.tar.gz
android_packages_apps_Jelly-837ec77d439912d9e54f613326adbbaea4d316c4.tar.bz2
android_packages_apps_Jelly-837ec77d439912d9e54f613326adbbaea4d316c4.zip
Add an indicator icon for incognito mode.
Change-Id: I08d5abd1f3f19cc5680a561e8e3d7ae4a8fa7902
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/org/lineageos/jelly/MainActivity.java4
-rw-r--r--app/src/main/res/layout/search_bar.xml12
2 files changed, 15 insertions, 1 deletions
diff --git a/app/src/main/java/org/lineageos/jelly/MainActivity.java b/app/src/main/java/org/lineageos/jelly/MainActivity.java
index 71e4e61..b7f52b5 100644
--- a/app/src/main/java/org/lineageos/jelly/MainActivity.java
+++ b/app/src/main/java/org/lineageos/jelly/MainActivity.java
@@ -55,6 +55,7 @@ import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.webkit.CookieManager;
import android.widget.ImageButton;
+import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
@@ -142,6 +143,9 @@ public class MainActivity extends WebViewExtActivity implements View.OnTouchList
// Make sure prefs are set before loading them
PreferenceManager.setDefaultValues(this, R.xml.settings, false);
+ ImageView incognitoIcon = (ImageView) findViewById(R.id.incognito);
+ incognitoIcon.setVisibility(incognito ? View.VISIBLE : View.GONE);
+
setupMenu();
mWebView = (WebViewExt) findViewById(R.id.web_view);
mWebView.init(this, editText, progressBar, incognito);
diff --git a/app/src/main/res/layout/search_bar.xml b/app/src/main/res/layout/search_bar.xml
index b69a586..5c2994f 100644
--- a/app/src/main/res/layout/search_bar.xml
+++ b/app/src/main/res/layout/search_bar.xml
@@ -52,12 +52,22 @@
android:padding="8dp"
android:src="@drawable/ic_menu" />
+ <ImageView
+ android:id="@+id/incognito"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentStart="true"
+ android:alpha="0.70"
+ android:scaleType="center"
+ android:src="@drawable/ic_incognito" />
+
<org.lineageos.jelly.ui.EditTextExt
android:id="@+id/url_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_alignParentStart="true"
+ android:layout_toEndOf="@id/incognito"
android:layout_toStartOf="@id/search_menu"
+ android:layout_alignWithParentIfMissing="true"
android:background="@null"
android:fadingEdge="vertical"
android:imeOptions="actionSearch"