Merge "modified settings to use settingslib class"
This commit is contained in:
committed by
Android (Google) Code Review
commit
7036d46889
@@ -42,7 +42,7 @@
|
|||||||
android:layout_height="wrap_content"/>
|
android:layout_height="wrap_content"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<com.android.settings.widget.LinkTextView
|
<com.android.settingslib.widget.LinkTextView
|
||||||
android:id="@android:id/title"
|
android:id="@android:id/title"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
@@ -23,7 +23,7 @@
|
|||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="24dp">
|
android:padding="24dp">
|
||||||
|
|
||||||
<com.android.settings.widget.LinkTextView
|
<com.android.settingslib.widget.LinkTextView
|
||||||
android:id="@+id/support_disclaimer_text"
|
android:id="@+id/support_disclaimer_text"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
@@ -1,66 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2014 The Android Open Source Project
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.android.settings.widget;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.support.annotation.NonNull;
|
|
||||||
import android.support.v13.view.ViewCompat;
|
|
||||||
import android.text.Spanned;
|
|
||||||
import android.text.method.LinkMovementMethod;
|
|
||||||
import android.text.style.ClickableSpan;
|
|
||||||
import android.util.AttributeSet;
|
|
||||||
import android.view.MotionEvent;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import com.android.setupwizardlib.util.LinkAccessibilityHelper;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Copied from setup wizard.
|
|
||||||
*/
|
|
||||||
public class LinkTextView extends TextView {
|
|
||||||
|
|
||||||
private LinkAccessibilityHelper mAccessibilityHelper;
|
|
||||||
|
|
||||||
public LinkTextView(Context context) {
|
|
||||||
this(context, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public LinkTextView(Context context, AttributeSet attrs) {
|
|
||||||
super(context, attrs);
|
|
||||||
mAccessibilityHelper = new LinkAccessibilityHelper(this);
|
|
||||||
ViewCompat.setAccessibilityDelegate(this, mAccessibilityHelper);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setText(CharSequence text, BufferType type) {
|
|
||||||
super.setText(text, type);
|
|
||||||
if (text instanceof Spanned) {
|
|
||||||
final ClickableSpan[] spans =
|
|
||||||
((Spanned) text).getSpans(0, text.length(), ClickableSpan.class);
|
|
||||||
if (spans.length > 0) {
|
|
||||||
setMovementMethod(LinkMovementMethod.getInstance());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected boolean dispatchHoverEvent(@NonNull MotionEvent event) {
|
|
||||||
if (mAccessibilityHelper.dispatchHoverEvent(event)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return super.dispatchHoverEvent(event);
|
|
||||||
}
|
|
||||||
}
|
|
Reference in New Issue
Block a user