aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/layout
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-12-27 23:23:44 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-27 23:23:44 -0800
commitbb5da5aa1e8b9636edf44eaca98f16e8cc034046 (patch)
tree56539837cd8a1cb1db542dddd66d203cd28b43ca /java/res/layout
parent5bd724ef01293d7934c5c658f33f9b96ead92fd9 (diff)
parenta2982dd5a7b44a388464b5885366e52c2f828b43 (diff)
downloadlatinime-bb5da5aa1e8b9636edf44eaca98f16e8cc034046.tar.gz
latinime-bb5da5aa1e8b9636edf44eaca98f16e8cc034046.tar.xz
latinime-bb5da5aa1e8b9636edf44eaca98f16e8cc034046.zip
am a2982dd5: Refactor to add SeekBarDialog
* commit 'a2982dd5a7b44a388464b5885366e52c2f828b43': Refactor to add SeekBarDialog
Diffstat (limited to 'java/res/layout')
-rw-r--r--java/res/layout/seek_bar_dialog.xml (renamed from java/res/layout/sound_effect_volume_dialog.xml)7
-rw-r--r--java/res/layout/vibration_settings_dialog.xml49
2 files changed, 3 insertions, 53 deletions
diff --git a/java/res/layout/sound_effect_volume_dialog.xml b/java/res/layout/seek_bar_dialog.xml
index 294663006..a47e9a038 100644
--- a/java/res/layout/sound_effect_volume_dialog.xml
+++ b/java/res/layout/seek_bar_dialog.xml
@@ -2,7 +2,7 @@
<!--
/*
**
-** Copyright 2011, The Android Open Source Project
+** Copyright 2012, 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.
@@ -30,15 +30,14 @@
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:layout_margin="10dp">
- <TextView android:id="@+id/sound_effect_volume_value"
+ <TextView android:id="@+id/seek_bar_dialog_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20dp"/>
</LinearLayout>
<SeekBar
- android:id="@+id/sound_effect_volume_bar"
+ android:id="@+id/seek_bar_dialog_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:max="100"
android:layout_margin="10dp"/>
</LinearLayout>
diff --git a/java/res/layout/vibration_settings_dialog.xml b/java/res/layout/vibration_settings_dialog.xml
deleted file mode 100644
index c9fb6ec4e..000000000
--- a/java/res/layout/vibration_settings_dialog.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, 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.
-*/
--->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="10dp">
- <LinearLayout
- android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:layout_margin="10dp">
- <TextView android:id="@+id/vibration_value"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="20dp"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/settings_ms"
- android:textSize="20dp"/>
- </LinearLayout>
- <SeekBar
- android:id="@+id/vibration_settings"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:max="250"
- android:layout_margin="10dp"/>
-</LinearLayout>