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

Commit 22653e83 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'eclair-release' of... 

Merge branch 'eclair-release' of git://android.git.kernel.org/platform/packages/apps/DeskClock into eclair

Conflicts:
	res/values/strings.xml
parents 0a18ea17 6ecdeccc

res/layout-land/desk_clock.xml

+3 −2
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ 
                    android:layout_width="wrap_content"

                    android:src="@drawable/ic_round_brightness"

                    android:contentDescription="@string/nightmode_button_description"

                    android:nextFocusDown="@+id/alarm_button"

                    />

            </LinearLayout>
@@ -97,7 +98,7 @@ 
                <include layout="@layout/desk_clock_time_date"

                    android:layout_height="wrap_content"

                    android:layout_width="0dip"

                    android:layout_weight="4"

                    android:layout_weight="5"

                    />



                <include layout="@layout/desk_clock_weather"
@@ -119,7 +120,7 @@ 
    <View android:id="@+id/window_tint"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent"

        android:background="#E0000000"

        android:background="#CC000000"

        android:visibility="visible"

        android:clickable="false"

        />

res/layout/desk_clock.xml

+2 −1
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 
                    android:layout_width="wrap_content"

                    android:src="@drawable/ic_round_brightness"

                    android:contentDescription="@string/nightmode_button_description"

                    android:nextFocusDown="@+id/alarm_button"

                    />

            </LinearLayout>
@@ -112,7 +113,7 @@ 
    <View android:id="@+id/window_tint"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent"

        android:background="#E0000000"

        android:background="#CC000000"

        android:visibility="visible"

        android:clickable="false"

        />

res/menu/desk_clock_menu.xml

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 
    <item android:id="@+id/menu_item_add_alarm"

        android:title="@string/add_alarm"

        android:icon="@drawable/ic_menu_add"/>

    <item android:id="@+id/menu_item_dock_settings"

        android:title="@string/menu_item_dock_settings"

        android:icon="@android:drawable/ic_menu_preferences"/>

</menu>

res/values-cs/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -107,4 +107,5 @@ 
    <string name="desk_clock_button_description" msgid="968868045496561043">"Zobrazení hodin"</string>

    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>

    <string name="weather_fetch_failure" msgid="7517010911981312358">"Informace o počasí aktuálně nejsou k dispozici."</string>

    <string name="menu_item_dock_settings" msgid="3524235151132971114">"Nastavení doku"</string>

</resources>

res/values-da/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -107,4 +107,5 @@ 
    <string name="desk_clock_button_description" msgid="968868045496561043">"Urvisning"</string>

    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>

    <string name="weather_fetch_failure" msgid="7517010911981312358">"Oplysninger om vejret er ikke tilgængelige i øjeblikket."</string>

    <string name="menu_item_dock_settings" msgid="3524235151132971114">"Indstillinger for dockingstation"</string>

</resources>