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

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

Merge "Fix possible NPE while finding device override value from resource"

parents f70bcf3d bd9887a5

java/res/values-land/keyboard-heights.xml

+0 −2
Original line number Diff line number Diff line
@@ -33,7 +33,5 @@ 
    <!-- Preferable keyboard height in absolute scale: 45.0mm -->

        <!-- Xoom -->

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

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

        <item>,</item>

    </string-array>

</resources>

java/res/values/keyboard-heights.xml

+0 −2
Original line number Diff line number Diff line
@@ -33,7 +33,5 @@ 
    <!-- Preferable keyboard height in absolute scale: 48.0mm -->

        <!-- Xoom -->

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

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

        <item>,</item>

    </string-array>

</resources>

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

+0 −2
Original line number Diff line number Diff line
@@ -59,7 +59,5 @@ 
        <item>MODEL=XT1035:MANUFACTURER=motorola,18</item>

        <!-- Sony Xperia Z, Z Ultra -->

        <item>MODEL=C6603|C6806:MANUFACTURER=Sony,35</item>

        <!-- Default value for unknown device. The negative value means system default. -->

        <item>,-1</item>

    </string-array>

</resources>

java/res/values/keypress-volumes.xml

+0 −2
Original line number Diff line number Diff line
@@ -26,7 +26,5 @@ 
        <item>HARDWARE=grouper,0.3f</item>

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

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

        <!-- Default value for unknown device. The negative value means system default. -->

        <item>,-1.0f</item>

    </string-array>

</resources>

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

+0 −2
Original line number Diff line number Diff line
@@ -23,7 +23,5 @@ 
             See {@link com.android.inputmethod.keyboard.PointerTracker}. -->

        <!-- Xoom -->

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

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

        <item>,false</item>

    </string-array>

</resources>