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

Commit 77899b1d authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am e94bbca3: Aggregate theme resources into one file 

* commit 'e94bbca3':
  Aggregate theme resources into one file
parents 7fefe2a7 e94bbca3

java/res/values/attrs.xml

+17 −13
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 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.

<!--

/*

**

** 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.

*/

-->



<resources>

java/res/values/colors.xml

+17 −13
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 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.

<!--

/*

**

** 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.

*/

-->



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

java/res/values/emoji-categories.xml

+17 −13
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2013 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.

<!--

/*

**

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

*/

-->



<!-- Note: This emoji code point list is valid prior to JB-MR2 (API < 18).

java/res/values/keyboard-icons-gb.xml

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

<!-- Copyright (C) 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.

-->



<resources>

    <style name="KeyboardIcons.GB">

        <!-- Keyboard icons -->

        <item name="iconShiftKey">@drawable/sym_keyboard_shift</item>

        <item name="iconDeleteKey">@drawable/sym_keyboard_delete</item>

        <item name="iconSettingsKey">@drawable/sym_keyboard_settings</item>

        <item name="iconSpaceKey">@drawable/sym_keyboard_space</item>

        <item name="iconEnterKey">@drawable/sym_keyboard_return</item>

        <item name="iconSearchKey">@drawable/sym_keyboard_search</item>

        <item name="iconTabKey">@drawable/sym_keyboard_tab</item>

        <item name="iconShortcutKey">@drawable/sym_keyboard_mic</item>

        <item name="iconShortcutForLabel">@drawable/sym_keyboard_label_mic</item>

        <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space</item>

        <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked</item>

        <!-- TODO: Needs non-holo disabled shortcut icon drawable -->

        <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_holo</item>

        <item name="iconTabKeyPreview">@drawable/sym_keyboard_feedback_tab</item>

        <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch</item>

        <!-- TODO: Needs dedicated black theme ZWNJ and ZWJ icons -->

        <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo</item>

        <item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo</item>

        <item name="iconEmojiKey">@drawable/ic_emoji_dark</item>

    </style>

</resources>

java/res/values/keyboard-icons-ics.xml

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

<!-- Copyright (C) 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.

-->



<resources>

    <style name="KeyboardIcons.ICS">

        <!-- Keyboard icons -->

        <!-- TODO: The following holo icon for phone (drawable-hdpi and drawable-xhdpi) are missing.

             sym_keyboard_123_mic_holo

             -->

        <item name="iconShiftKey">@drawable/sym_keyboard_shift_holo</item>

        <item name="iconDeleteKey">@drawable/sym_keyboard_delete_holo</item>

        <item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo</item>

        <item name="iconSpaceKey">@null</item>

        <item name="iconEnterKey">@drawable/sym_keyboard_return_holo</item>

        <item name="iconSearchKey">@drawable/sym_keyboard_search_holo</item>

        <item name="iconTabKey">@drawable/sym_keyboard_tab_holo</item>

        <item name="iconShortcutKey">@drawable/sym_keyboard_voice_holo</item>

        <item name="iconShortcutForLabel">@drawable/sym_keyboard_label_mic_holo</item>

        <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_holo</item>

        <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_holo</item>

        <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_holo</item>

        <item name="iconTabKeyPreview">@drawable/sym_keyboard_feedback_tab</item>

        <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch</item>

        <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo</item>

        <item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo</item>

        <item name="iconEmojiKey">@drawable/ic_emoji_light</item>

    </style>

</resources>