aboutsummaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorTakeshi Hagikura <thagikura@google.com>2016-11-08 07:38:54 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-08 07:38:54 +0000
commit3a6398609b03829eb8119d2da025006bcd2300f6 (patch)
tree8dcf67c54b35c219d907bbacebe8af4f68a360fc /ui
parent86e8a413bce80c81ecf2f62728b38a230ac7a99d (diff)
parentec7652998fd1a8d64ed8aaae4f004e4510c849a4 (diff)
downloadandroid-3a6398609b03829eb8119d2da025006bcd2300f6.tar.gz
Fix lint warnings.
am: ec7652998f Change-Id: Ia21a4c45ed91970b548923c07dbf860b0a902290
Diffstat (limited to 'ui')
-rw-r--r--ui/window/AdvancedImmersiveMode/Application/build.gradle2
-rw-r--r--ui/window/AdvancedImmersiveMode/Application/src/main/res/layout/fragment_flags.xml30
-rw-r--r--ui/window/AdvancedImmersiveMode/Application/src/main/res/values/strings.xml27
3 files changed, 43 insertions, 16 deletions
diff --git a/ui/window/AdvancedImmersiveMode/Application/build.gradle b/ui/window/AdvancedImmersiveMode/Application/build.gradle
index 28e75d67..59e868e6 100644
--- a/ui/window/AdvancedImmersiveMode/Application/build.gradle
+++ b/ui/window/AdvancedImmersiveMode/Application/build.gradle
@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.1.3'
+ classpath 'com.android.tools.build:gradle:2.2.1'
}
}
diff --git a/ui/window/AdvancedImmersiveMode/Application/src/main/res/layout/fragment_flags.xml b/ui/window/AdvancedImmersiveMode/Application/src/main/res/layout/fragment_flags.xml
index 2c74e83f..c59b3b39 100644
--- a/ui/window/AdvancedImmersiveMode/Application/src/main/res/layout/fragment_flags.xml
+++ b/ui/window/AdvancedImmersiveMode/Application/src/main/res/layout/fragment_flags.xml
@@ -1,43 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical" android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/flag_enable_lowprof"
- android:text="Enable Low Profile Mode" />
+ android:text="@string/enable_low_profile_mode" />
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/flag_hide_navbar"
- android:text="Hide Navigation bar" />
+ android:text="@string/hide_navigation_bar" />
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/flag_hide_statbar"
- android:text="Hide Status Bar" />
+ android:text="@string/hide_status_bar" />
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/flag_enable_immersive"
- android:text="Enable Immersive Mode" />
+ android:text="@string/enable_immersive_mode" />
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/flag_enable_immersive_sticky"
- android:text="Enable Immersive Mode (Sticky)" />
+ android:text="@string/enable_immersive_mode_sticky" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Do things!"
+ android:text="@string/do_things"
android:id="@+id/btn_changeFlags" />
@@ -45,25 +46,24 @@
android:layout_marginTop="@dimen/margin_large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Common flag presets"/>
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal" android:layout_width="match_parent"
+ android:text="@string/common_flag_presets" />
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Immersive Mode"
+ android:text="@string/immersive_mode"
android:id="@+id/btn_immersive" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Leanback Mode"
+ android:text="@string/leanback_mode"
android:id="@+id/btn_leanback" />
</LinearLayout>
-
-
-
</LinearLayout> \ No newline at end of file
diff --git a/ui/window/AdvancedImmersiveMode/Application/src/main/res/values/strings.xml b/ui/window/AdvancedImmersiveMode/Application/src/main/res/values/strings.xml
new file mode 100644
index 00000000..6cfd28c7
--- /dev/null
+++ b/ui/window/AdvancedImmersiveMode/Application/src/main/res/values/strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ Copyright 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+ <string name="enable_low_profile_mode">Enable Low Profile Mode</string>
+ <string name="hide_navigation_bar">Hide Navigation bar</string>
+ <string name="hide_status_bar">Hide Status Bar</string>
+ <string name="enable_immersive_mode">Enable Immersive Mode</string>
+ <string name="enable_immersive_mode_sticky">Enable Immersive Mode (Sticky)</string>
+ <string name="do_things">Do things!</string>
+ <string name="common_flag_presets">Common flag presets</string>
+ <string name="immersive_mode">Immersive Mode</string>
+ <string name="leanback_mode">Leanback Mode</string>
+</resources> \ No newline at end of file