Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2982dd5 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Refactor to add SeekBarDialog 

Change-Id: Id8e08a1d5ec5efb2baf96a2634111619fcb9fd4e
parent ff778fd4

java/res/layout/sound_effect_volume_dialog.xml→java/res/layout/seek_bar_dialog.xml

+3 −4
Original line number Diff line number Diff line
@@ -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>

java/res/layout/vibration_settings_dialog.xml

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
<?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>

java/res/values/donottranslate.xml

+0 −1
Original line number Diff line number Diff line
@@ -233,6 +233,5 @@ 
    <!-- dictionary pack package name /settings activity (for shared prefs and settings) -->

    <string name="dictionary_pack_package_name">com.google.android.inputmethod.latin.dictionarypack</string>

    <string name="dictionary_pack_settings_activity">com.google.android.inputmethod.latin.dictionarypack.DictionarySettingsActivity</string>

    <string name="settings_ms">ms</string>

    <string name="settings_warning_researcher_mode">Attention!  You are using the special keyboard for research purposes.</string>

</resources>

java/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -76,6 +76,9 @@ 
    <!-- Description for delay for dismissing a popup on screen: default value of the delay [CHAR LIMIT=15] -->

    <string name="key_preview_popup_dismiss_default_delay">Default</string>



    <!-- Units abbreviation for the keypress vibration duration (milliseconds) [CHAR LIMIT=10] -->

    <string name="settings_keypress_vibration_duration"><xliff:g id="milliseconds">%s</xliff:g>ms</string>



    <!-- Option name for enabling or disabling the use of names of people in Contacts for suggestion and correction [CHAR LIMIT=25] -->

    <string name="use_contacts_dict">Suggest Contact names</string>

    <!-- Description for option enabling or disabling the use of names of people in Contacts for suggestion and correction [CHAR LIMIT=65] -->

java/src/com/android/inputmethod/latin/AudioAndHapticFeedbackManager.java

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ import com.android.inputmethod.latin.VibratorUtils; 
 * complexity of settings and the like.

 */

public final class AudioAndHapticFeedbackManager {

    public static final int MAX_KEYPRESS_VIBRATION_DURATION = 250; // millisecond



    private final AudioManager mAudioManager;

    private final VibratorUtils mVibratorUtils;