Skip to content

GitLab

T
tangled
Commit 416617d0 authored by Mehran Mahmoudi's avatar Mehran Mahmoudi Committed by Commit Bot
Browse files
Options

[Touchless] Change key functions IPH layout 

This changes the key functions In-Product Help layout. It also no longer
shows the IPH for changes in cursor visibility.

Bug: 983734
Change-Id: I8bffcb150e1d34a37c284db37c448c91f9f251a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1716952
Commit-Queue: Mehran Mahmoudi <mahmoudi@chromium.org>
Reviewed-by: default avatarJustin DeWitt <dewittj@chromium.org>
Reviewed-by: default avatarDavid Bokan <bokan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680580}
parent a2abd5ac
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 12 deletions
chrome/android/touchless/java/res/layout/notouch_key_functions_view.xml
View file @ 416617d0
......@@ -24,18 +24,18 @@
android:layout_weight="1"
android:gravity="center"
android:paddingStart="@dimen/notouch_key_functions_tooltip_item_padding"
android:text="1"
android:text="0"
android:textAppearance="@style/TextAppearance.NoTouchKeyFunctionsIPH"/>
<ImageView
android:id="@+id/navigation_mode_image"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:paddingBottom="@dimen/notouch_key_functions_tooltip_item_image_vertical_padding"
android:paddingEnd="@dimen/notouch_key_functions_tooltip_item_padding"
android:paddingTop="@dimen/notouch_key_functions_tooltip_item_image_vertical_padding"
android:scaleType="centerInside"
app:srcCompat="@drawable/ic_zoom_out"/>
android:scaleType="centerInside"/>
</LinearLayout>
......@@ -52,19 +52,19 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:paddingStart="4dp"
android:text="2"
android:paddingStart="@dimen/notouch_key_functions_tooltip_item_padding"
android:text="1"
android:textAppearance="@style/TextAppearance.NoTouchKeyFunctionsIPH"/>
<ImageView
android:id="@+id/navigation_mode_image"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:paddingBottom="@dimen/notouch_key_functions_tooltip_item_image_vertical_padding"
android:paddingEnd="4dp"
android:paddingEnd="@dimen/notouch_key_functions_tooltip_item_padding"
android:paddingTop="@dimen/notouch_key_functions_tooltip_item_image_vertical_padding"
android:scaleType="centerInside"/>
android:scaleType="centerInside"
app:srcCompat="@drawable/ic_zoom_out"/>
</LinearLayout>
......
chrome/android/touchless/java/src/org/chromium/chrome/browser/touchless/ui/iph/KeyFunctionsIPHMediator.java
View file @ 416617d0
......@@ -44,13 +44,11 @@ public class KeyFunctionsIPHMediator implements CursorObserver {
static final int INTRODUCTORY_SESSIONS = 6;
static final int INTRODUCTORY_PAGE_LOAD_CYCLE = 3;
@IntDef({DisplayCause.PAGE_LOAD_STARTED, DisplayCause.PAGE_LOAD_FINISHED,
DisplayCause.FALLBACK_CURSOR_TOGGLED})
@IntDef({DisplayCause.PAGE_LOAD_STARTED, DisplayCause.PAGE_LOAD_FINISHED})
@Retention(RetentionPolicy.SOURCE)
private @interface DisplayCause {
int PAGE_LOAD_STARTED = 0;
int PAGE_LOAD_FINISHED = 1;
int FALLBACK_CURSOR_TOGGLED = 2;
}
KeyFunctionsIPHMediator(PropertyModel model, ActivityTabProvider activityTabProvider,
......@@ -68,7 +66,6 @@ public class KeyFunctionsIPHMediator implements CursorObserver {
@Override
public void onFallbackCursorModeToggled(boolean isOn) {
mIsFallbackCursorModeOn = isOn;
show(DisplayCause.FALLBACK_CURSOR_TOGGLED);
}
private void show(@DisplayCause int displayCause) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment