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

Commit 31dc5673 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "TV likes to post long press power toast when triggering dream by short press" into main

parents e138d6b7 44705492

core/res/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -6911,4 +6911,7 @@ ul.</string> 














    <!-- Label describing no blinking for Settings.Secure.ACCESSIBILITY_TEXT_CURSOR_BLINK_INTERVAL_MS. -->















    <string name="no_blink_accessibility_text_cursor_blink_label">Don\'t blink</string>

























    <!-- Toast message that is shown when dream is triggered by short press power button. [CHAR LIMIT=TOAST] -->













    <string name="long_press_power_to_turn_off_tv_toast">Long press Power button to turn off TV</string>















</resources>

























core/res/res/values/symbols.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -831,6 +831,7 @@













  <java-symbol type="string" name="lockscreen_access_pattern_start" />















  <java-symbol type="string" name="lockscreen_emergency_call" />















  <java-symbol type="string" name="lockscreen_return_to_call" />













  <java-symbol type="string" name="long_press_power_to_turn_off_tv_toast" />















  <java-symbol type="string" name="low_memory" />















  <java-symbol type="string" name="mic_access_off_toast" />















  <java-symbol type="string" name="mic_access_on_toast" />

































services/core/java/com/android/server/policy/PhoneWindowManager.java



+9
−0




























Original line number
Diff line number
Diff line








@@ -1309,6 +1309,15 @@ public class PhoneWindowManager implements WindowManagerPolicy {













        }































        dreamManagerInternal.requestDream();













        if (mHasFeatureLeanback













                && getResolvedLongPressOnPowerBehavior() == LONG_PRESS_POWER_GO_TO_SLEEP) {













            Toast.makeText(













                    mContext,













                    UiThread.get().getLooper(),













                    mContext.getString(R.string.long_press_power_to_turn_off_tv_toast),













                    Toast.LENGTH_LONG)













                    .show();













        }















    }































    /**