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

Commit a066c59e authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'froyo' into froyo-release

parents e407ecc3 3bb5e4d3
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -638,11 +638,13 @@ public final class Calendar {
            private static final int COLUMN_ATTENDEE_TYPE = 3;
            private static final int COLUMN_ATTENDEE_STATUS = 4;
            private static final String[] EXTENDED_PROJECTION = new String[] {
                    ExtendedProperties._ID,
                    ExtendedProperties.NAME,
                    ExtendedProperties.VALUE,
                    ExtendedProperties.VALUE
            };
            private static final int COLUMN_NAME = 0;
            private static final int COLUMN_VALUE = 1;
            private static final int COLUMN_ID = 0;
            private static final int COLUMN_NAME = 1;
            private static final int COLUMN_VALUE = 2;

            private static final String WHERE_EVENT_ID = "event_id=?";

@@ -772,6 +774,8 @@ public final class Calendar {
                try {
                    while (subCursor.moveToNext()) {
                        ContentValues extendedValues = new ContentValues();
                        extendedValues.put(ExtendedProperties._ID,
                                subCursor.getString(COLUMN_ID));
                        extendedValues.put(ExtendedProperties.NAME,
                                subCursor.getString(COLUMN_NAME));
                        extendedValues.put(ExtendedProperties.VALUE,
+16 −10
Original line number Diff line number Diff line
@@ -22,28 +22,28 @@
    android:background="@drawable/recent_dialog_background"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:paddingTop="3dip"
    android:paddingBottom="3dip"
    android:gravity="center"
    android:padding="4dip"
    android:orientation="vertical">

    <!-- Title -->
    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        style="?android:attr/windowTitleStyle"
        android:layout_marginTop="5dip"
        android:layout_marginBottom="15dip"
        android:layout_height="40dip"
        android:gravity="center"
        android:textAppearance="?android:attr/textAppearanceSmall"
        android:textColor="#80FFFFFF"
        android:textStyle="bold"
        android:singleLine="true"
        android:text="@android:string/recent_tasks_title" />

    <!-- This is only intended to be visible when all buttons (below) are invisible -->
    <TextView
        android:id="@+id/no_applications_message"
        android:layout_width="320dip"
        android:layout_height="wrap_content"
        android:layout_marginTop="15dip"
        android:layout_marginBottom="15dip"
        android:layout_height="80dip"
        android:gravity="center"
        android:textAppearance="?android:attr/textAppearanceMedium"
        android:textAppearance="?android:attr/textAppearanceSmall"
        android:text="@android:string/no_recent_tasks" />

    <!-- The first row has a fixed-width because the UI spec requires the box
@@ -96,4 +96,10 @@
            android:id="@+id/button7" />

    </LinearLayout>

    <!-- spacer to balance out the title above -->
    <FrameLayout
        android:layout_height="40dip"
        android:layout_width="match_parent"
        />
</com.android.internal.policy.impl.RecentApplicationsBackground>
+5 −10
Original line number Diff line number Diff line
@@ -134,8 +134,7 @@
    <string name="power_off" msgid="4266614107412865048">"Vypnout"</string>
    <string name="shutdown_progress" msgid="2281079257329981203">"Vypínání..."</string>
    <string name="shutdown_confirm" msgid="649792175242821353">"Váš telefon bude vypnut."</string>
    <!-- no translation found for recent_tasks_title (3691764623638127888) -->
    <skip />
    <string name="recent_tasks_title" msgid="3691764623638127888">"Nejnovější"</string>
    <string name="no_recent_tasks" msgid="279702952298056674">"Žádné nedávno použité aplikace."</string>
    <string name="global_actions" msgid="2406416831541615258">"Možnosti telefonu"</string>
    <string name="global_action_lock" msgid="2844945191792119712">"Zámek obrazovky"</string>
@@ -858,12 +857,8 @@
    <string name="car_mode_disable_notification_message" msgid="668663626721675614">"Vyberte, chcete-li ukončit režim Na cestě."</string>
    <string name="tethered_notification_title" msgid="8146103971290167718">"Sdílení je aktivní"</string>
    <string name="tethered_notification_message" msgid="3067108323903048927">"Dotykem zahájíte konfiguraci"</string>
    <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
    <skip />
    <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
    <skip />
    <!-- no translation found for throttled_notification_title (6269541897729781332) -->
    <skip />
    <!-- no translation found for throttled_notification_message (4712369856601275146) -->
    <skip />
    <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Vysoké využití mobilních dat"</string>
    <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Dotykem zobrazíte další informace o využití mobilních dat"</string>
    <string name="throttled_notification_title" msgid="6269541897729781332">"Byl překročen limit mobilních dat"</string>
    <string name="throttled_notification_message" msgid="4712369856601275146">"Dotykem zobrazíte další informace o využití mobilních dat"</string>
</resources>
+5 −10
Original line number Diff line number Diff line
@@ -134,8 +134,7 @@
    <string name="power_off" msgid="4266614107412865048">"Sluk"</string>
    <string name="shutdown_progress" msgid="2281079257329981203">"Lukker ned ..."</string>
    <string name="shutdown_confirm" msgid="649792175242821353">"lydstyrke for opkald"</string>
    <!-- no translation found for recent_tasks_title (3691764623638127888) -->
    <skip />
    <string name="recent_tasks_title" msgid="3691764623638127888">"Seneste"</string>
    <string name="no_recent_tasks" msgid="279702952298056674">"Der er ingen nye programmer."</string>
    <string name="global_actions" msgid="2406416831541615258">"Indstillinger for telefon"</string>
    <string name="global_action_lock" msgid="2844945191792119712">"Skærmlås"</string>
@@ -858,12 +857,8 @@
    <string name="car_mode_disable_notification_message" msgid="668663626721675614">"Vælg for at afslutte biltilstand."</string>
    <string name="tethered_notification_title" msgid="8146103971290167718">"Tethering aktiveret"</string>
    <string name="tethered_notification_message" msgid="3067108323903048927">"Tryk for at konfigurere"</string>
    <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
    <skip />
    <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
    <skip />
    <!-- no translation found for throttled_notification_title (6269541897729781332) -->
    <skip />
    <!-- no translation found for throttled_notification_message (4712369856601275146) -->
    <skip />
    <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Højt mobildataforbrug"</string>
    <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Tryk for oplysninger om brug af mobildata"</string>
    <string name="throttled_notification_title" msgid="6269541897729781332">"Grænsen for mobildata er overskredet"</string>
    <string name="throttled_notification_message" msgid="4712369856601275146">"Tryk for oplysninger om brug af mobildata"</string>
</resources>
+5 −10
Original line number Diff line number Diff line
@@ -134,8 +134,7 @@
    <string name="power_off" msgid="4266614107412865048">"Ausschalten"</string>
    <string name="shutdown_progress" msgid="2281079257329981203">"Herunterfahren..."</string>
    <string name="shutdown_confirm" msgid="649792175242821353">"Ihr Telefon wird heruntergefahren."</string>
    <!-- no translation found for recent_tasks_title (3691764623638127888) -->
    <skip />
    <string name="recent_tasks_title" msgid="3691764623638127888">"Neueste"</string>
    <string name="no_recent_tasks" msgid="279702952298056674">"Keine neuen Anwendungen."</string>
    <string name="global_actions" msgid="2406416831541615258">"Telefonoptionen"</string>
    <string name="global_action_lock" msgid="2844945191792119712">"Bildschirmsperre"</string>
@@ -858,12 +857,8 @@
    <string name="car_mode_disable_notification_message" msgid="668663626721675614">"Zum Beenden des Automodus auswählen"</string>
    <string name="tethered_notification_title" msgid="8146103971290167718">"Tethering aktiv"</string>
    <string name="tethered_notification_message" msgid="3067108323903048927">"Zum Konfigurieren berühren"</string>
    <!-- no translation found for throttle_warning_notification_title (4890894267454867276) -->
    <skip />
    <!-- no translation found for throttle_warning_notification_message (2609734763845705708) -->
    <skip />
    <!-- no translation found for throttled_notification_title (6269541897729781332) -->
    <skip />
    <!-- no translation found for throttled_notification_message (4712369856601275146) -->
    <skip />
    <string name="throttle_warning_notification_title" msgid="4890894267454867276">"Hohe Mobildatennutzung"</string>
    <string name="throttle_warning_notification_message" msgid="2609734763845705708">"Weitere Informationen über die Mobildatennutzung durch Berühren aufrufen"</string>
    <string name="throttled_notification_title" msgid="6269541897729781332">"Mobildatenlimit überschritten"</string>
    <string name="throttled_notification_message" msgid="4712369856601275146">"Weitere Informationen über die Mobildatennutzung durch Berühren aufrufen"</string>
</resources>
Loading