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

Commit b3735744 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I40dd2cfc into eclair 

* changes:
  Fix for 2202408: Replace Never Timeout with 30 minutes
parents 62d3407d 40dd2cfc

res/values/arrays.xml

+3 −4
Original line number Diff line number Diff line
@@ -79,12 +79,11 @@ 
        <item>1 minute</item>

        <item>2 minutes</item>

        <item>10 minutes</item>

        <!-- Choosing this means the screen will only turn off after the user manually does so.  There will be no inactivity check. -->

        <item>Never timeout</item>

        <item>30 minutes</item>

    </string-array>



    <!-- Do not translate. -->

    <string-array name="screen_timeout_values">

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

        <!-- Do not translate. -->

        <item>15000</item>

        <!-- Do not translate. -->
@@ -96,7 +95,7 @@ 
        <!-- Do not translate. -->

        <item>600000</item>

        <!-- Do not translate. -->

        <item>-1</item>

        <item>1800000</item>

    </string-array>



    <!-- TTS settings -->