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

Commit c0a8abbb authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Merge branch 'cupcake'

parents 4e0ea752 590c0a97

AndroidManifest.xml

+10 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>

    <uses-permission android:name="android.permission.WRITE_APN_SETTINGS"/>

    <uses-permission android:name="android.permission.ACCESS_CHECKIN_PROPERTIES"/>

    <uses-permission android:name="android.permission.READ_USER_DICTIONARY"/>

    <uses-permission android:name="android.permission.WRITE_USER_DICTIONARY"/>



    <application android:label="@string/settings_label" android:icon="@drawable/ic_launcher_settings">
@@ -150,6 +152,14 @@ 
            </intent-filter>

        </activity>



        <activity android:name="UserDictionarySettings" android:icon="@drawable/app_settings"

                android:label="@string/user_dict_settings_titlebar">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

        </activity>



        <activity android:name="SoundAndDisplaySettings" android:label="@string/sound_and_display_settings"

                android:theme="@android:style/Theme.NoTitleBar">

            <intent-filter>

res/drawable/ic_menu_add.png

0 → 100755
+1.97 KiB
Loading image diff...

res/layout/dialog_edittext.xml

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

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

-->



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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:paddingLeft="8dip"

    android:paddingRight="8dip">

    

    <EditText 

        android:id="@+id/edittext"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

    />

        

</LinearLayout>
 
 No newline at end of file

res/layout/list_content_with_empty_view.xml

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

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

-->



 

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

    android:layout_width="fill_parent"

    android:layout_height="fill_parent" >



    <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list"

        android:layout_width="fill_parent" 

        android:layout_height="fill_parent"

        android:drawSelectorOnTop="false"

        />



    <TextView android:id="@+id/empty"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent"

        android:padding="5dip"

        android:gravity="center"

        android:visibility="gone" />



</FrameLayout>

res/values-cs/arrays.xml

+14 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

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

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string-array name="timezone_filters">