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

Commit ba40639b authored by Lorenzo Lucena Maguire's avatar Lorenzo Lucena Maguire Committed by Android (Google) Code Review
Browse files

Merge changes I4226e442,Ie220e783 into main 

* changes:
  Disable Wallet Preference if Quick Access Wallet Service is unavailable
  Update String for Double Tap Power Wallet Footer
parents 27a72e72 1fc46805

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -11626,9 +11626,9 @@ Data usage charges may apply.</string> 
    <!-- Description text for tip suggesting user to modify lockscreen shortcut. [CHAR LIMIT=200]-->

    <string name="double_tap_power_lockscreen_shortcut_tip_description"><xliff:g id="double_tap_power_target_action" example="Camera">%1$s</xliff:g> is also your lock screen shortcut. Want to change it?</string>

    <!-- Title for footer explaining why wallet is not available for the double tap power gesture. [CHAR LIMIT=200]-->

    <string name="double_tap_power_wallet_footer_title">Wallet is not available. Your current default wallet app does not support the gesture.</string>

    <string name="double_tap_power_wallet_footer_title">Your current default wallet app does not support this gesture</string>

    <!-- Summary for footer explaining why wallet is not available for the double tap power gesture. [CHAR LIMIT=100]-->

    <string name="double_tap_power_wallet_footer_learn_more_text">Tap here to change it.</string>

    <string name="double_tap_power_wallet_footer_learn_more_text">Change default wallet</string>

















    <!-- Title text for double twist for camera mode [CHAR LIMIT=60]-->

























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



+1
−3






























Original line number
Diff line number
Diff line







@@ -54,9 +54,7 @@ public class DoubleTapPowerForWalletPreferenceController extends BasePreferenceC







                    if (uri.equals(









                            DoubleTapPowerSettingsUtils









                                    .DOUBLE_TAP_POWER_BUTTON_GESTURE_ENABLED_URI)) {









                        mPreference.setEnabled(









                                DoubleTapPowerSettingsUtils









                                        .isDoubleTapPowerButtonGestureEnabled(mContext));









                        mPreference.setEnabled(isPreferenceEnabled());









                    } else if (uri.equals(









                            DoubleTapPowerSettingsUtils









                                    .DOUBLE_TAP_POWER_BUTTON_GESTURE_TARGET_ACTION_URI)) {