blimp/client/app/android/java/res/xml/blimp_preferences.xml - Issue 2173563003: Blimp settings UI integration for Chrome, everything still lives in Blimp.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: blimp/client/app/android/java/res/xml/blimp_preferences.xml

Issue 2173563003: Blimp settings UI integration for Chrome, everything still lives in Blimp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix nit issues, and prepare to commit. Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « blimp/client/app/android/java/res/xml/about_blimp_preferences.xml ('k') | blimp/client/app/android/java/src/org/chromium/blimp/preferences/PreferencesUtil.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: blimp/client/app/android/java/res/xml/blimp_preferences.xml

diff --git a/blimp/client/app/android/java/res/xml/about_blimp_preferences.xml b/blimp/client/app/android/java/res/xml/blimp_preferences.xml

similarity index 63%

copy from blimp/client/app/android/java/res/xml/about_blimp_preferences.xml

copy to blimp/client/app/android/java/res/xml/blimp_preferences.xml

index 30cf166d96474d40f4fd1c41a8c043bde35fa1c5..97dc6025cde9a9c93369f4b01a33406cc1d26199 100644

--- a/blimp/client/app/android/java/res/xml/about_blimp_preferences.xml

+++ b/blimp/client/app/android/java/res/xml/blimp_preferences.xml

@@ -4,13 +4,10 @@

found in the LICENSE file. -->

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

- android:title="@string/about_blimp_preferences">

- <Preference

- android:key="application_version"

- android:title="@string/application_version_title" />

- <Preference

- android:key="os_version"

- android:title="@string/os_version_title" />

+ android:title="@string/blimp_about_blimp_preferences">

+ <SwitchPreference

+ android:key="blimp_switch"

+ android:title="@string/blimp_switch" />

<Preference

android:key="blimp_engine_ip"

android:title="@string/blimp_engine_ip" />

@@ -20,6 +17,6 @@

<ListPreference

android:key="blimp_assigner_url"

android:title="@string/blimp_assigner_url"

- android:entries="@array/assigner_envs"

- android:entryValues="@array/assigner_urls" />

+ android:entries="@array/blimp_assigner_envs"

+ android:entryValues="@array/blimp_assigner_urls" />

</PreferenceScreen>