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

Commit 565ced45 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Refactor StringUtils.findPrefixedString to findValueOfKey"

parents 4705c0fa 6d3d2ae0

java/res/values/keyboard-heights.xml

+6 −6
Original line number Diff line number Diff line
@@ -19,20 +19,20 @@ 
-->



<resources>

    <!-- Build.HARDWARE,keyboard_height_in_dp -->

    <!-- Build condition,keyboard_height_in_dp -->

    <string-array name="keyboard_heights" translatable="false">

    <!-- Preferable keyboard height in absolute scale: 1.285in -->

        <!-- Droid -->

        <item>sholes,227.0167</item>

        <item>HARDWARE=sholes,227.0167</item>

        <!-- Nexus One -->

        <item>mahimahi,217.5932</item>

        <item>HARDWARE=mahimahi,217.5932</item>

        <!-- Nexus S -->

        <item>herring,200.8554</item>

        <item>HARDWARE=herring,200.8554</item>

        <!-- Galaxy Nexus -->

        <item>tuna,202.5869</item>

        <item>HARDWARE=tuna,202.5869</item>

    <!-- Preferable keyboard height in absolute scale: 48.0mm -->

        <!-- Xoom -->

        <item>stingray,283.1337</item>

        <item>HARDWARE=stingray,283.1337</item>

    <!-- Default value for unknown device: empty string -->

        <item>DEFAULT,</item>

    </string-array>

java/res/values/keypress-vibration-durations.xml

+5 −5
Original line number Diff line number Diff line
@@ -18,16 +18,16 @@ 
*/

-->

<resources>

    <!-- Build.HARDWARE,duration_in_milliseconds -->

    <!-- Build condition,duration_in_milliseconds -->

    <string-array name="keypress_vibration_durations" translatable="false">

        <!-- Nexus S -->

        <item>herring,5</item>

        <item>HARDWARE=herring,5</item>

        <!-- Galaxy Nexus -->

        <item>tuna,5</item>

        <item>HARDWARE=tuna,5</item>

        <!-- Nexus 4 -->

        <item>mako,5</item>

        <item>HARDWARE=mako,5</item>

        <!-- Nexus 10 -->

        <item>manta,16</item>

        <item>HARDWARE=manta,16</item>

        <!-- Default value for unknown device -->

        <item>DEFAULT,20</item>

    </string-array>

java/res/values/keypress-volumes.xml

+7 −7
Original line number Diff line number Diff line
@@ -18,14 +18,14 @@ 
*/

-->

<resources>

    <!-- Build condition,volume -->

    <string-array name="keypress_volumes" translatable="false">

        <!-- Build.HARDWARE,volume -->

        <item>herring,0.5f</item>

        <item>tuna,0.5f</item>

        <item>stingray,0.4f</item>

        <item>grouper,0.3f</item>

        <item>mako,0.3f</item>

        <item>manta,0.2f</item>

        <item>HARDWARE=herring,0.5f</item>

        <item>HARDWARE=tuna,0.5f</item>

        <item>HARDWARE=stingray,0.4f</item>

        <item>HARDWARE=grouper,0.3f</item>

        <item>HARDWARE=mako,0.3f</item>

        <item>HARDWARE=manta,0.2f</item>

        <!-- Default value for unknown device -->

        <item>DEFAULT,0.2f</item>

    </string-array>

java/res/values/phantom-sudden-move-event-device-list.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ 
-->

<resources>

    <string-array name="phantom_sudden_move_event_device_list" translatable="false">

        <!-- "Build.HARDWARE,true" that needs "phantom sudden move event" hack.

        <!-- "Build condition,true" that needs "phantom sudden move event" hack.

             See {@link com.android.inputmethod.keyboard.PointerTracker}. -->

        <!-- Xoom -->

        <item>stingray,true</item>

        <item>HARDWARE=stingray,true</item>

        <!-- Default value for unknown device -->

        <item>DEFAULT,false</item>

    </string-array>

java/res/values/sudden-jumping-touch-event-device-list.xml

+3 −3
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ 
-->

<resources>

    <string-array name="sudden_jumping_touch_event_device_list" translatable="false">

        <!-- "Build.HARDWARE,true" that needs "sudden jump touch event" hack.

        <!-- "Build condition,true" that needs "sudden jump touch event" hack.

             See {@link com.android.inputmethod.keyboard.SuddenJumpingTouchEventHandler}. -->

        <!-- Nexus One -->

        <item>mahimahi,true</item>

        <item>HARDWARE=mahimahi,true</item>

        <!-- Droid -->

        <item>sholes,true</item>

        <item>HARDWARE=sholes,true</item>

        <!-- Default value for unknown device -->

        <item>DEFAULT,false</item>

    </string-array>