resolved conflicts for merge of ea7bcecf to master

diff --cc 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
@@@ -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 --cc 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
@@@ -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"
          />