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

Commit 9cfe959a authored by Jason Chang's avatar Jason Chang
Browse files

Fix the description under timeout isn't translated completely 

Reuse existing string instead of using new string for one-handed
timeout description.

Bug: 159298092

Test: manual
Change-Id: I903998dc58218f67d37fa449ef1a6a0615637bb5
parent 9ee730cc

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -10916,8 +10916,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()]));









    }









}