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

Commit 722f5c79 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Remove voice key from keyboard layout 

Bug: 14419121
Change-Id: I71031f1ed9735a5a05dc584299b56512fb0b6866
parent de3afcfd

java/res/xml-sw600dp/key_shortcut.xml→java/res/xml-sw600dp/key_settings.xml

+2 −19
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<!--

/*

**

** Copyright 2012, The Android Open Source Project

** Copyright 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.
@@ -23,29 +23,12 @@ 
>

    <switch>

        <case

            latin:supportsSwitchingToShortcutIme="true"

            latin:clobberSettingsKey="false"

        >

            <Key

                latin:keyStyle="shortcutKeyStyle"

                latin:keyLabelFlags="hasPopupHint|preserveCase"

                latin:moreKeys="!text/keyspec_settings" />

        </case>

        <case

            latin:supportsSwitchingToShortcutIme="true"

            latin:clobberSettingsKey="true"

        >

            <Key

                latin:keyStyle="shortcutKeyStyle" />

        </case>

        <case

            latin:supportsSwitchingToShortcutIme="false"

            latin:clobberSettingsKey="false"

        >

            <Key

                latin:keyStyle="settingsKeyStyle" />

        </case>

        <!-- supportsSwitchingToShortcutIme="false" clobberSettingsKey="true" -->

        <!-- clobberSettingsKey="true" -->

        <default>

            <Spacer />

        </default>

java/res/xml-sw600dp/row_dvorak4.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
            latin:keyStyle="toSymbolKeyStyle"

            latin:keyWidth="10.0%p" />

        <include

            latin:keyboardLayout="@xml/key_shortcut" />

            latin:keyboardLayout="@xml/key_settings" />

        <include

            latin:keyboardLayout="@xml/key_f1" />

        <include

java/res/xml-sw600dp/row_pcqwerty5.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    >

        <include

            latin:keyWidth="9.0%p"

            latin:keyboardLayout="@xml/key_shortcut" />

            latin:keyboardLayout="@xml/key_settings" />

        <switch>

            <case

                latin:languageSwitchKeyEnabled="true"

java/res/xml-sw600dp/row_qwerty4.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
            latin:keyStyle="toSymbolKeyStyle"

            latin:keyWidth="10.0%p" />

        <include

            latin:keyboardLayout="@xml/key_shortcut" />

            latin:keyboardLayout="@xml/key_settings" />

        <include

            latin:keyboardLayout="@xml/key_f1" />

        <include

java/res/xml/key_f1.xml

+0 −17
Original line number Diff line number Diff line
@@ -36,27 +36,10 @@ 
                latin:keySpec="\@"

                latin:keyStyle="f1MoreKeysStyle" />

        </case>

        <case

            latin:supportsSwitchingToShortcutIme="false"

        >

            <Key

                latin:keySpec="!text/keyspec_comma"

                latin:keyLabelFlags="hasPopupHint"

                latin:keyStyle="f1MoreKeysStyle" />

        </case>

        <!-- latin:supportsSwitchingToShortcutIme="true" -->

        <case

            latin:hasShortcutKey="true"

        >

            <Key

                latin:keyStyle="shortcutKeyStyle" />

        </case>

        <!-- latin:hasShortcutKey="false" -->

        <default>

            <Key

                latin:keySpec="!text/keyspec_comma"

                latin:keyLabelFlags="hasPopupHint"

                latin:additionalMoreKeys="!text/keyspec_shortcut"

                latin:keyStyle="f1MoreKeysStyle" />

        </default>

    </switch>