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

Commit 39a3ac6f authored by Pat Manning's avatar Pat Manning
Browse files

Update string for "swipe to go home" when in button nav. 

Bug: 252938555
Test: manual
Change-Id: Id52867ec6a9b82a44ab0a803a9824258d9ad4044
parent 92564539

quickstep/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ 
    <string name="allset_title">All set!</string>

    <!-- Hint string at the bottom of "All Set" page [CHAR LIMIT=NONE] -->

    <string name="allset_hint">Swipe up to go Home</string>

    <!-- Hint string at the bottom of "All Set" page for button navigation [CHAR LIMIT=NONE] -->

    <string name="allset_button_hint">Tap the home button to go to your home screen</string>

    <!-- Description of "All Set" page on phones [CHAR LIMIT=NONE] -->

    <string name="allset_description">You\u2019re ready to start using your phone</string>

    <!-- Description of "All Set" page on tablets [CHAR LIMIT=NONE] -->

quickstep/src/com/android/quickstep/interaction/AllSetActivity.java

+8 −4
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import android.widget.TextView; 
import androidx.annotation.Nullable;

import androidx.core.graphics.ColorUtils;



import com.android.launcher3.DeviceProfile;

import com.android.launcher3.InvariantDeviceProfile;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;
@@ -120,10 +121,9 @@ public class AllSetActivity extends Activity { 
        mContentView = findViewById(R.id.content_view);

        mSwipeUpShift = getResources().getDimension(R.dimen.allset_swipe_up_shift);



        boolean isTablet = InvariantDeviceProfile.INSTANCE.get(getApplicationContext())

                .getDeviceProfile(this).isTablet;

        DeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(this).getDeviceProfile(this);

        TextView subtitle = findViewById(R.id.subtitle);

        subtitle.setText(isTablet

        subtitle.setText(dp.isTablet

                ? R.string.allset_description_tablet : R.string.allset_description);



        TextView tv = findViewById(R.id.navigation_settings);
@@ -137,7 +137,11 @@ public class AllSetActivity extends Activity { 
            }

        });



        findViewById(R.id.hint).setAccessibilityDelegate(new SkipButtonAccessibilityDelegate());

        TextView hintTextView = findViewById(R.id.hint);

        if (!dp.isGestureMode) {

            hintTextView.setText(R.string.allset_button_hint);

        }

        hintTextView.setAccessibilityDelegate(new SkipButtonAccessibilityDelegate());

        mTISBindHelper = new TISBindHelper(this, this::onTISConnected);



        mVibrator = getSystemService(Vibrator.class);