Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix keyboard shortcut display layout

Browse Source 
The keyboard_shortcuts_keyword TextView in keyboard_shortcut_app_item
layout was wrap_content making it take all the space in case the text is
too long. The TextView is now rendered indide a KeyboardShortcutsLayout
which extends the RelativeLayout and sets the maxWidth of
keyboard_shortcuts_keyword TextView to 70% when onMeasure is called with
EXACT MeasureSpec.

Bug: 32980732
Fixes: 32980732
Test: Manual
Change-Id: I1250802af0a4ad011e842318384ca6fe5686989c
This commit is contained in:
Peeyush Agarwal
2016-12-15 15:09:58 +00:00
parent 0de5d03c9d
commit e2c893fc2d
2 changed files with 64 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/res/layout/keyboard_shortcut_app_item.xml
View File

@@ -14,7 +14,8 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.android.systemui.statusbar.KeyboardShortcutAppItemLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -37,6 +38,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingEnd="12dp"
android:paddingBottom="4dp"
android:textColor="@color/ksh_keyword_color"
android:textSize="16sp"
android:maxLines="5"
@@ -55,4 +57,4 @@
android:scrollHorizontally="false"
android:layout_centerVertical="true"
android:focusable="true"/>
</RelativeLayout>
</com.android.systemui.statusbar.KeyboardShortcutAppItemLayout>

60
packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcutAppItemLayout.java Normal file
View File

@@ -0,0 +1,60 @@
/*
* Copyright (C) 2016 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.systemui.statusbar;
import android.content.Context;
import android.util.AttributeSet;
import android.view.View;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.android.systemui.R;
/**
* Layout used for displaying keyboard shortcut items inside an alert dialog.
* The layout sets the maxWidth of shortcuts keyword textview to 70% of available space.
*/
public class KeyboardShortcutAppItemLayout extends RelativeLayout {
private static final double MAX_WIDTH_PERCENT_FOR_KEYWORDS = 0.70;
public KeyboardShortcutAppItemLayout(Context context) {
super(context);
}
public KeyboardShortcutAppItemLayout(Context context, AttributeSet attrs) {
super(context, attrs);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
if (MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.EXACTLY) {
ImageView shortcutIcon = (ImageView) findViewById(R.id.keyboard_shortcuts_icon);
TextView shortcutKeyword = (TextView) findViewById(R.id.keyboard_shortcuts_keyword);
int totalMeasuredWidth = MeasureSpec.getSize(widthMeasureSpec);
int totalPadding = getPaddingLeft() + getPaddingRight();
int availableWidth = totalMeasuredWidth - totalPadding;
if (shortcutIcon.getVisibility() == View.VISIBLE) {
availableWidth = availableWidth - shortcutIcon.getMeasuredWidth();
}
shortcutKeyword.setMaxWidth((int)
Math.round(availableWidth * MAX_WIDTH_PERCENT_FOR_KEYWORDS));
}
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
}
}