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

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

Merge commit 'korg/cupcake'

parents 3462f332 efa454e6

AndroidManifest.xml

+8 −12
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ 
                >

            <intent-filter>

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

                <action android:name="android.settings.INPUT_METHOD_SETTINGS" />

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

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

            </intent-filter>

        </activity>
@@ -157,16 +159,6 @@ 
            </intent-filter>

        </activity>



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

                android:label="@string/input_methods_settings_title"

                >

            <intent-filter>

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

                <action android:name="android.settings.INPUT_METHOD_SETTINGS" />

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

            </intent-filter>

        </activity>



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

                android:label="@string/user_dict_settings_titlebar">

            <intent-filter>
@@ -381,7 +373,9 @@ 
            </intent-filter>

        </receiver>



        <activity android:name="ActivityPicker" android:label="@string/activity_picker_label">

        <activity android:name="ActivityPicker"

                android:label="@string/activity_picker_label"

                android:theme="@*android:style/Theme.Dialog.Alert">

            <intent-filter>

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

                <category android:name="android.intent.category.DEFAULT" />
@@ -482,7 +476,9 @@ 
       </receiver>



        <!-- Standard picker for widgets -->

        <activity android:name="AppWidgetPickActivity" android:label="@string/widget_picker_title">

        <activity android:name="AppWidgetPickActivity"

                android:label="@string/widget_picker_title"

                android:theme="@*android:style/Theme.Dialog.Alert">

            <intent-filter>

                <action android:name="android.appwidget.action.APPWIDGET_PICK" />

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

res/drawable/border_item_thumbnail.png

deleted100755 → 0
−230 B
Loading image diff...

res/layout/apn_preference_layout.xml

0 → 100644
+65 −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.

-->



<LinearLayout

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

    android:layout_width="fill_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:gravity="center_vertical">



    <RelativeLayout

        android:id="@+android:id/text_layout"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginLeft="16sp"

        android:layout_marginRight="6sp"

        android:layout_marginTop="6sp"

        android:layout_marginBottom="6sp"

        android:layout_weight="1"

        android:focusable="true"

        android:background="@android:drawable/menuitem_background">



        <TextView

            android:id="@+android:id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:focusable="true"

            android:singleLine="true"

            android:textAppearance="?android:attr/textAppearanceLarge" />



        <TextView

            android:id="@+android:id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_below="@android:id/title"

            android:layout_alignLeft="@android:id/title"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:maxLines="2" />



    </RelativeLayout>



    <RadioButton

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

        android:id="@+android:id/apn_radiobutton"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginLeft="4dip"

        android:layout_marginRight="4dip"

        android:layout_gravity="center_vertical"

        android:clickable="true" />



</LinearLayout>

res/layout/battery_info.xml

+0 −17
Original line number Diff line number Diff line
@@ -68,22 +68,5 @@ 
        <TextView android:id="@+id/uptime" style="@style/info_value" />

    </LinearLayout>



    <!-- Awaketime Battery -->

    <LinearLayout style="@style/entry_layout">

        <TextView android:text="@string/battery_info_awake_battery" style="@style/info_label" />

        <TextView android:id="@+id/awakeBattery" style="@style/info_value" />

    </LinearLayout>



    <!-- Awaketime Plugged In -->

    <LinearLayout style="@style/entry_layout">

        <TextView android:text="@string/battery_info_awake_plugged" style="@style/info_label" />

        <TextView android:id="@+id/awakePlugged" style="@style/info_value" />

    </LinearLayout>



    <!-- Screen On Time -->

    <LinearLayout style="@style/entry_layout">

        <TextView android:text="@string/battery_info_screen_on" style="@style/info_label" />

        <TextView android:id="@+id/screenOn" style="@style/info_value" />

    </LinearLayout>

</LinearLayout>

res/layout/installed_app_details.xml

+18 −18
Original line number Diff line number Diff line
@@ -265,6 +265,24 @@ 
                 android:layout_height="wrap_content" />

        </RelativeLayout>



        <!-- Other controls section -->

        <TextView

            style="?android:attr/listSeparatorTextViewStyle"

            android:text="@string/controls_label" />



        <RelativeLayout

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical">

            <Button android:id="@+id/force_stop_button"

                android:layout_alignParentRight="true"

                android:layout_alignParentTop="true"

                android:layout_centerHorizontal="true"

                android:layout_width="150dip"

                android:text="@string/force_stop"

                android:layout_height="wrap_content" />

        </RelativeLayout>



        <!-- Permissions section -->

        <LinearLayout

            android:id="@+id/permissions_section"
@@ -288,24 +306,6 @@ 
                android:layout_height="fill_parent"

                android:orientation="vertical"/>

        </LinearLayout>



        <!-- Prefered activities section -->

        <TextView

            style="?android:attr/listSeparatorTextViewStyle"

            android:text="@string/controls_label" />



        <RelativeLayout

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical">

            <Button android:id="@+id/force_stop_button"

                android:layout_alignParentRight="true"

                android:layout_alignParentTop="true"

                android:layout_centerHorizontal="true"

                android:layout_width="150dip"

                android:text="@string/force_stop"

                android:layout_height="wrap_content" />

        </RelativeLayout>

    </LinearLayout>

</ScrollView>