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

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

auto import from //branches/cupcake/...@131421

parent 1feaa857

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ 


        <activity android:name="GadgetPickActivity" android:label="@string/gadget_picker_title">

            <intent-filter>

                <action android:name="android.gadget.action.PICK_GADGET" />

                <action android:name="android.gadget.action.GADGET_PICK" />

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

            </intent-filter>

        </activity>

res/drawable/ic_menu_filter_settings.png

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

res/layout/compute_sizes.xml

+4 −6
Original line number Diff line number Diff line
@@ -20,19 +20,17 @@ 
    android:layout_height="fill_parent">

    <ListView 

        android:id="@android:id/list"

        android:layout_weight="1"

        android:drawSelectorOnTop="false"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent">

    </ListView>

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

        android:layout_height="wrap_content" />

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

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:paddingLeft="20dip"

        android:paddingTop="5dip"

        android:text="@string/empty_list_msg"

        android:textSize="15sp" />

        android:gravity="center"

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

</LinearLayout>

res/values-en-rGB/strings.xml

deleted100644 → 0
+0 −1234

File deleted.

Preview size limit exceeded, changes collapsed.

res/values-nb-nokeys/strings.xml

0 → 100644
+19 −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 name="applications_settings_summary">"Installerte applikasjoner, hurtigtaster"</string>

</resources>