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

Commit fd3509ef authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android (Google) Code Review
Browse files

Merge "Consolidate 7inch and 10inch layout"

parents 9666a228 8b060262

java/res/xml-sw768dp-land/kbd_more_keys_keyboard_template.xml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2010, 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.

*/

-->



<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

    latin:keyWidth="3.5%p"

    latin:rowHeight="@dimen/popup_key_height"

    style="?attr/moreKeysKeyboardStyle"

    >

</Keyboard>

java/res/xml-sw768dp-land/kbd_number.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2011, 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.

*/

-->



<Keyboard

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

    latin:keyboardLeftPadding="10%p"

    latin:keyboardRightPadding="10%p"

    latin:keyWidth="13.250%p"

    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"

>

    <include

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

</Keyboard>

java/res/xml-sw768dp-land/kbd_phone.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2011, 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.

*/

-->



<Keyboard

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

    latin:keyboardLeftPadding="10%p"

    latin:keyboardRightPadding="10%p"

    latin:keyWidth="13.250%p"

    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"

>

    <include

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

</Keyboard>

java/res/xml-sw768dp-land/kbd_phone_symbols.xml

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2011, 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.

*/

-->



<Keyboard

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

    latin:keyboardLeftPadding="10%p"

    latin:keyboardRightPadding="10%p"

    latin:keyWidth="13.250%p"

    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"

>

    <!-- Tablet doesn't have phone symbols keyboard -->

    <include

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

</Keyboard>

java/res/xml-sw768dp/kbd_10_10_7_symbols.xml

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2012, 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.

*/

-->



<Keyboard

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

    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"

>

    <include

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

</Keyboard>