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

Commit 2b909e97 authored by Andrei Stingaceanu's avatar Andrei Stingaceanu
Browse files

Keyboard Shortcuts - cleanup 

Clean up the code, introduce and use a separator, fix the
existing end-of-groups separator.

Bug: 26848253
Change-Id: I2b7723ebf257e7176f08551766c59d86d01cf6a6
parent bf1c5013

packages/SystemUI/res/layout/keyboard_shortcuts_wrapper.xml→packages/SystemUI/res/layout/keyboard_shortcuts_category_separator.xml

+8 −5
Original line number Diff line number Diff line
@@ -15,8 +15,11 @@ 
  ~ limitations under the License

  -->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

              android:orientation="vertical"

<View xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

              android:layout_height="wrap_content">

</LinearLayout>
 
    android:layout_height="1dp"

    android:layout_marginStart="24dp"

    android:layout_marginTop="8dp"

    android:layout_marginEnd="0dp"

    android:layout_marginBottom="20dp"

    android:background="?android:attr/dividerHorizontal" />

packages/SystemUI/res/layout/keyboard_shortcuts_container.xml

+4 −4
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
  -->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

              android:orientation="horizontal"

    android:orientation="vertical"

    android:layout_width="match_parent"

              android:layout_height="wrap_content">

</LinearLayout>
 
    android:layout_height="wrap_content" />

packages/SystemUI/res/layout/keyboard_shortcuts_view.xml

+25 −15
Original line number Diff line number Diff line
@@ -14,25 +14,35 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<LinearLayout



<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/keyboard_shortcuts_wrapper"

    android:layout_width="488dp"

    android:layout_height="wrap_content">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:focusable="true">

        android:orientation="vertical">

        <ScrollView

            android:id="@+id/keyboard_shortcuts_scroll_view"

            android:layout_width="0dp"

            android:layout_height="0dp"

            android:layout_weight="1">

            android:layout_width="match_parent"

            android:layout_height="wrap_content">

            <LinearLayout

                android:id="@+id/keyboard_shortcuts_container"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical"/>

        </ScrollView>

        <!-- Required for stretching to full available height when the items in the scroll view

             occupy less space then the full height -->

        <View

            android:layout_width="match_parent"

            android:layout_height="1dp"

            android:background="?android:attr/listDivider"/>

            android:layout_height="0dp"

            android:layout_weight="1"/>

    </LinearLayout>

    <View

        android:layout_gravity="bottom"

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:background="?android:attr/dividerHorizontal"/>

</FrameLayout>

packages/SystemUI/res/values/colors.xml

+0 −1
Original line number Diff line number Diff line
@@ -158,5 +158,4 @@ 
    <!-- Keyboard shortcuts colors -->

    <color name="ksh_system_group_color">#ff00bcd4</color>

    <color name="ksh_application_group_color">#fff44336</color>

    <color name="ksh_dialog_background_color">#ffffffff</color>

</resources>

packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java

+35 −48
Original line number Diff line number Diff line
@@ -23,17 +23,15 @@ import android.content.DialogInterface; 
import android.content.DialogInterface.OnClickListener;

import android.os.Handler;

import android.os.Looper;

import android.util.DisplayMetrics;

import android.view.ContextThemeWrapper;

import android.view.KeyEvent;

import android.view.KeyboardShortcutGroup;

import android.view.KeyboardShortcutInfo;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup.LayoutParams;

import android.view.Window;

import android.view.WindowManager.KeyboardShortcutsReceiver;

import android.widget.LinearLayout;

import android.widget.ScrollView;

import android.widget.TextView;



import com.android.systemui.R;
@@ -65,7 +63,7 @@ public class KeyboardShortcuts { 
    private Dialog mKeyboardShortcutsDialog;



    public KeyboardShortcuts(Context context) {

        this.mContext = context;

        this.mContext = new ContextThemeWrapper(context, android.R.style.Theme_Material_Light);

    }



    public void toggleKeyboardShortcuts() {
@@ -108,39 +106,27 @@ public class KeyboardShortcuts { 
        mHandler.post(new Runnable() {

            @Override

            public void run() {

                // TODO: break all this code out into a handleShowKeyboard...

                // Might add more things posted; should consider adding a custom handler so

                // you can send the keyboardShortcutsGroups as part of the message.

                handleShowKeyboardShortcuts(keyboardShortcutGroups);

            }

        });

    }



    private void handleShowKeyboardShortcuts(List<KeyboardShortcutGroup> keyboardShortcutGroups) {

        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(mContext);

        LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(

                LAYOUT_INFLATER_SERVICE);

        final View keyboardShortcutsView = inflater.inflate(

                R.layout.keyboard_shortcuts_view, null);

                DisplayMetrics dm = mContext.getResources().getDisplayMetrics();

                ScrollView scrollView = (ScrollView) keyboardShortcutsView.findViewById(

                        R.id.keyboard_shortcuts_scroll_view);

                // TODO: find a better way to set the height.

                scrollView.setLayoutParams(new LinearLayout.LayoutParams(

                        LayoutParams.WRAP_CONTENT,

                        (int) (dm.heightPixels * dm.density)));



        populateKeyboardShortcuts((LinearLayout) keyboardShortcutsView.findViewById(

                R.id.keyboard_shortcuts_container), keyboardShortcutGroups);

        dialogBuilder.setView(keyboardShortcutsView);

        dialogBuilder.setPositiveButton(R.string.quick_settings_done, dialogCloseListener);

        mKeyboardShortcutsDialog = dialogBuilder.create();

        mKeyboardShortcutsDialog.setCanceledOnTouchOutside(true);



                // Setup window.

        Window keyboardShortcutsWindow = mKeyboardShortcutsDialog.getWindow();

        keyboardShortcutsWindow.setType(TYPE_SYSTEM_DIALOG);

                keyboardShortcutsWindow.setBackgroundDrawable(

                        mContext.getDrawable(R.color.ksh_dialog_background_color));

                keyboardShortcutsWindow.setGravity(TOP);

        mKeyboardShortcutsDialog.show();

    }

        });

    }



    private void populateKeyboardShortcuts(LinearLayout keyboardShortcutsLayout,

            List<KeyboardShortcutGroup> keyboardShortcutGroups) {
@@ -156,36 +142,37 @@ public class KeyboardShortcuts { 
                    : mContext.getColor(R.color.ksh_application_group_color));

            keyboardShortcutsLayout.addView(categoryTitle);



            LinearLayout shortcutWrapper = (LinearLayout) inflater.inflate(

                    R.layout.keyboard_shortcuts_wrapper, null);

            LinearLayout shortcutContainer = (LinearLayout) inflater.inflate(

                    R.layout.keyboard_shortcuts_container, keyboardShortcutsLayout, false);

            final int itemsSize = group.getItems().size();

            for (int j = 0; j < itemsSize; j++) {

                KeyboardShortcutInfo info = group.getItems().get(j);

                View shortcutView = inflater.inflate(R.layout.keyboard_shortcut_app_item, null);

                View shortcutView = inflater.inflate(R.layout.keyboard_shortcut_app_item,

                        shortcutContainer, false);

                TextView textView = (TextView) shortcutView

                        .findViewById(R.id.keyboard_shortcuts_keyword);

                textView.setText(info.getLabel());



                LinearLayout shortcutItemsContainer = (LinearLayout) shortcutView

                        .findViewById(R.id.keyboard_shortcuts_item_container);

                List<String> shortcutKeys = getHumanReadableShortcutKeys(info);

                final int shortcutKeysSize = shortcutKeys.size();

                for (int k = 0; k < shortcutKeysSize; k++) {

                    String shortcutKey = shortcutKeys.get(k);

                    TextView shortcutKeyView = (TextView) inflater.inflate(

                            R.layout.keyboard_shortcuts_key_view, null);

                            R.layout.keyboard_shortcuts_key_view, shortcutItemsContainer, false);

                    shortcutKeyView.setText(shortcutKey);

                    LinearLayout shortcutItemsContainer = (LinearLayout) shortcutView

                            .findViewById(R.id.keyboard_shortcuts_item_container);

                    shortcutItemsContainer.addView(shortcutKeyView);

                }

                shortcutWrapper.addView(shortcutView);

                shortcutContainer.addView(shortcutView);

            }

            keyboardShortcutsLayout.addView(shortcutContainer);

            if (i < keyboardShortcutGroupsSize - 1) {

                View separator = inflater.inflate(

                        R.layout.keyboard_shortcuts_category_separator, keyboardShortcutsLayout,

                        false);

                keyboardShortcutsLayout.addView(separator);

            }



            // TODO: merge container and wrapper into one xml file - wrapper is always a child of

            // container.

            LinearLayout shortcutsContainer = (LinearLayout) inflater.inflate(

                    R.layout.keyboard_shortcuts_container, null);

            shortcutsContainer.addView(shortcutWrapper);

            keyboardShortcutsLayout.addView(shortcutsContainer);

        }

    }