diff options
author | calderwoodra <calderwoodra@google.com> | 2018-04-23 19:17:58 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-04-23 19:18:41 -0700 |
commit | fa999aa84fcea512ec27b3fd2f97c1cee1379cec (patch) | |
tree | b00081f2807ce64e5a631a158e0469416c31bb71 /java/com/android/dialer/widget | |
parent | 88cdcf9f24c29162144b3f9e02f1e44a706c87c1 (diff) |
SpeedDialEntries with default numbers now properly show up.
This change includes:
- fixing an issue where default numbers were being removed when inserting duo
channels.
- setting a max height on the disambig dialog scrollview because it was
causing accessibility issues (and will be needed later).
Test: SpeedDialIntegrationTest, SpeedDialUiItemLoaderTest
PiperOrigin-RevId: 194023169
Change-Id: I4896fb5dbbb99aefd9713c6768ea9c07ca906d6d
Diffstat (limited to 'java/com/android/dialer/widget')
-rw-r--r-- | java/com/android/dialer/widget/MaxHeightScrollView.java | 64 | ||||
-rw-r--r-- | java/com/android/dialer/widget/res/values/attrs.xml | 3 |
2 files changed, 67 insertions, 0 deletions
diff --git a/java/com/android/dialer/widget/MaxHeightScrollView.java b/java/com/android/dialer/widget/MaxHeightScrollView.java new file mode 100644 index 000000000..cec8f8f35 --- /dev/null +++ b/java/com/android/dialer/widget/MaxHeightScrollView.java @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2018 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.dialer.widget; + +import android.content.Context; +import android.content.res.TypedArray; +import android.support.annotation.Nullable; +import android.util.AttributeSet; +import android.widget.ScrollView; + +/** {@link ScrollView} with a max height attribute. */ +public class MaxHeightScrollView extends ScrollView { + + private final int maxHeight; + + public MaxHeightScrollView(Context context, @Nullable AttributeSet attrs) { + this(context, attrs, 0); + } + + public MaxHeightScrollView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + this(context, attrs, defStyleAttr, 0); + } + + public MaxHeightScrollView( + Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + if (isInEditMode()) { + maxHeight = -1; + return; + } + + TypedArray array = + context.getTheme().obtainStyledAttributes(attrs, R.styleable.MaxHeightScrollView, 0, 0); + try { + maxHeight = array.getDimensionPixelSize(R.styleable.MaxHeightScrollView_maxHeight, -1); + } finally { + array.recycle(); + } + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + if (maxHeight < 0) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + } else { + super.onMeasure( + widthMeasureSpec, MeasureSpec.makeMeasureSpec(maxHeight, MeasureSpec.AT_MOST)); + } + } +} diff --git a/java/com/android/dialer/widget/res/values/attrs.xml b/java/com/android/dialer/widget/res/values/attrs.xml index bd5c3a4fb..ecf92bfc3 100644 --- a/java/com/android/dialer/widget/res/values/attrs.xml +++ b/java/com/android/dialer/widget/res/values/attrs.xml @@ -20,4 +20,7 @@ <attr format="dimension" name="resizing_text_min_size"/> </declare-styleable> + <declare-styleable name="MaxHeightScrollView"> + <attr name="maxHeight" format="dimension"/> + </declare-styleable> </resources> |