resolved conflicts for merge of ea7bcecf to master

diff --combined res/layout-land/desk_clock.xml
index 3c58098,fbe310c..b785514
--- 1/res/layout-land/desk_clock.xml
--- 2/res/layout-land/desk_clock.xml
+++ b/res/layout-land/desk_clock.xml
@@@ -17,13 -17,13 +17,13 @@@
  <!-- This is the alarm clock in LANDSCAPE desk dock mode.
       -->
  <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 -    android:layout_width="fill_parent"
 -    android:layout_height="fill_parent"
 +    android:layout_width="match_parent"
 +    android:layout_height="match_parent"
      >
      <LinearLayout
          android:id="@+id/desk_clock"
 -        android:layout_width="fill_parent"
 -        android:layout_height="fill_parent"
 +        android:layout_width="match_parent"
 +        android:layout_height="match_parent"
          android:orientation="vertical"
          android:paddingTop="25dip"
          >
@@@ -36,8 -36,8 +36,8 @@@
              android:orientation="vertical"
              android:layout_gravity="left"
              android:layout_weight="1"
 -            android:layout_width="fill_parent"
 -            android:layout_height="fill_parent"
 +            android:layout_width="match_parent"
 +            android:layout_height="match_parent"
              android:layout_marginLeft="25dip"
              android:layout_marginTop="18dip"
              android:layout_marginRight="18dip"
@@@ -47,7 -47,7 +47,7 @@@
              <!-- across the top: next alarm, battery, nightmode button -->
              <LinearLayout
                  android:orientation="horizontal"
 -                android:layout_width="fill_parent"
 +                android:layout_width="match_parent"
                  android:layout_height="wrap_content"
                  android:layout_weight="0"
                  android:layout_marginBottom="6dip"
@@@ -82,6 -82,7 +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>
  
@@@ -89,7 -90,7 +90,7 @@@
              <LinearLayout
                  android:orientation="horizontal"
                  android:layout_weight="1"
 -                android:layout_width="fill_parent"
 +                android:layout_width="match_parent"
                  android:layout_height="wrap_content"
                  android:gravity="bottom"
                  >
@@@ -97,7 -98,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"
@@@ -117,9 -118,9 +118,9 @@@
      </LinearLayout>
  
      <View android:id="@+id/window_tint"
 -        android:layout_width="fill_parent"
 -        android:layout_height="fill_parent"
 +        android:layout_width="match_parent"
 +        android:layout_height="match_parent"
-         android:background="#E0000000"
+         android:background="#CC000000"
          android:visibility="visible"
          android:clickable="false"
          />

diff --combined res/layout/desk_clock.xml
index cbc55d3,018ef1f..1306c18
--- 1/res/layout/desk_clock.xml
--- 2/res/layout/desk_clock.xml
+++ b/res/layout/desk_clock.xml
@@@ -20,14 -20,14 +20,14 @@@
       Buttons are provided to access alarms, music, and other useful functions.
       -->
  <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 -    android:layout_width="fill_parent"
 -    android:layout_height="fill_parent"
 +    android:layout_width="match_parent"
 +    android:layout_height="match_parent"
      >
      <!-- the top padding accounts for the status bar area -->
      <LinearLayout
          android:id="@+id/desk_clock"
 -        android:layout_width="fill_parent"
 -        android:layout_height="fill_parent"
 +        android:layout_width="match_parent"
 +        android:layout_height="match_parent"
          android:orientation="vertical"
          android:paddingTop="25dip"
          >
@@@ -40,8 -40,8 +40,8 @@@
              android:orientation="vertical"
              android:layout_gravity="left"
              android:layout_weight="1"
 -            android:layout_width="fill_parent"
 -            android:layout_height="fill_parent"
 +            android:layout_width="match_parent"
 +            android:layout_height="match_parent"
              android:layout_marginLeft="22dip"
              android:layout_marginTop="18dip"
              android:layout_marginRight="18dip"
@@@ -51,7 -51,7 +51,7 @@@
              <!-- across the top: next alarm, nightmode button -->
              <LinearLayout
                  android:orientation="horizontal"
 -                android:layout_width="fill_parent"
 +                android:layout_width="match_parent"
                  android:layout_height="wrap_content"
                  android:layout_weight="0"
                  android:layout_marginLeft="4dip"
@@@ -78,6 -78,7 +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>
  
@@@ -98,7 -99,7 +99,7 @@@
  
              <include layout="@layout/desk_clock_battery"
                  android:layout_height="wrap_content"
 -                android:layout_width="fill_parent"
 +                android:layout_width="match_parent"
                  android:layout_weight="0"
                  android:layout_marginLeft="4dip"
                  />
@@@ -110,9 -111,9 +111,9 @@@
      </LinearLayout>
  
      <View android:id="@+id/window_tint"
 -        android:layout_width="fill_parent"
 -        android:layout_height="fill_parent"
 +        android:layout_width="match_parent"
 +        android:layout_height="match_parent"
-         android:background="#E0000000"
+         android:background="#CC000000"
          android:visibility="visible"
          android:clickable="false"
          />