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

Commit 8ece8634 authored by Jason Chang's avatar Jason Chang Committed by Android (Google) Code Review
Browse files

Merge "Fix the description under timeout isn't translated completely"

parents 7595874e 9cfe959a

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -10922,8 +10922,6 @@ 
    <string name="one_handed_timeout_medium">8 seconds</string>

    <!-- Timeout(Long) title for one handed [CHAR LIMIT=60] -->

    <string name="one_handed_timeout_long">12 seconds</string>

    <!-- Timeout summary [CHAR LIMIT=60] -->

    <string name="one_handed_timeout_summary"><xliff:g id="timeout" example="4 seconds">After %1$s of inactivity</xliff:g></string>

    <!-- Search keywords for "One-Handed" settings [CHAR_LIMIT=NONE] -->

    <string name="keywords_one_handed">reachability</string>

























src/com/android/settings/gestures/OneHandedTimeoutPreferenceController.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -87,7 +87,7 @@ public class OneHandedTimeoutPreferenceController extends BasePreferenceControll













            return mContext.getResources().getString(R.string.screensaver_settings_summary_never);















        }















        return String.format(mContext.getResources().getString(













                R.string.one_handed_timeout_summary), mTimeoutMap.get(getTimeoutValue()));













                R.string.screen_timeout_summary), mTimeoutMap.get(getTimeoutValue()));















    }































    @Override

































tests/robotests/src/com/android/settings/gestures/OneHandedTimeoutPreferenceControllerTest.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -103,7 +103,7 @@ public class OneHandedTimeoutPreferenceControllerTest {













                OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue());































        assertThat(mController.getSummary()).isEqualTo(String.format(













                mContext.getResources().getString(R.string.one_handed_timeout_summary),













                mContext.getResources().getString(R.string.screen_timeout_summary),















                timeoutTitles[OneHandedSettingsUtils.OneHandedTimeout.SHORT.ordinal()]));















    }















}