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

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

Merge "Support multiple condition for getDeviceOverrideValue"

parents cb3bba3c d69fa0a0

java/res/values/keyboard-heights.xml

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,6 @@ 
        <!-- Xoom -->

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

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

        <item>DEFAULT,</item>

        <item>,</item>

    </string-array>

</resources>

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

+1 −1
Original line number Diff line number Diff line
@@ -29,6 +29,6 @@ 
        <!-- Nexus 10 -->

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

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

        <item>DEFAULT,20</item>

        <item>,20</item>

    </string-array>

</resources>

java/res/values/keypress-volumes.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,6 @@ 
        <item>HARDWARE=mako,0.3f</item>

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

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

        <item>DEFAULT,0.2f</item>

        <item>,0.2f</item>

    </string-array>

</resources>

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

+1 −1
Original line number Diff line number Diff line
@@ -24,6 +24,6 @@ 
        <!-- Xoom -->

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

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

        <item>DEFAULT,false</item>

        <item>,false</item>

    </string-array>

</resources>

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

+1 −1
Original line number Diff line number Diff line
@@ -26,6 +26,6 @@ 
        <!-- Droid -->

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

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

        <item>DEFAULT,false</item>

        <item>,false</item>

    </string-array>

</resources>