redlines for widget connectivity

b/17916808

Change-Id: Ibca1af3ef93eec7dd71cb7f31aabbd74447d719a

17 files changed, 12 insertions, 29 deletions

diff --git a/apps/LeanbackCustomizer/AndroidManifest.xml b/apps/LeanbackCustomizer/AndroidManifest.xml
index 5ec2147..e931ca2 100644
--- a/apps/LeanbackCustomizer/AndroidManifest.xml
+++ b/apps/LeanbackCustomizer/AndroidManifest.xml
@@ -3,8 +3,8 @@
     package="com.google.android.leanbacklauncher.partnercustomizer">
 
     <uses-sdk
-        android:minSdkVersion="19"
-        android:targetSdkVersion="19" />
+        android:minSdkVersion="21"
+        android:targetSdkVersion="21" />
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/apps/LeanbackCustomizer/src/com/google/android/leanbacklauncher/partnercustomizer/PartnerReceiver.java b/apps/LeanbackCustomizer/src/com/google/android/leanbacklauncher/partnercustomizer/PartnerReceiver.java
index 2c1282b..daef196 100644
--- a/apps/LeanbackCustomizer/src/com/google/android/leanbacklauncher/partnercustomizer/PartnerReceiver.java
+++ b/apps/LeanbackCustomizer/src/com/google/android/leanbacklauncher/partnercustomizer/PartnerReceiver.java
@@ -16,34 +16,17 @@
 
 package com.google.android.leanbacklauncher.partnercustomizer;
 
-import android.app.Activity;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
-import android.provider.Settings;
-import android.text.TextUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * This class posts notifications that are used to populate the Partner Row of the Leanback Launcher
@@ -70,7 +53,7 @@ public class PartnerReceiver extends BroadcastReceiver {
     private NotificationManager mNotifMan;
     private PackageManager mPkgMan;
 
-    // Cutoff value for when the Launcher displayes the Partner row as a single
+    // Cutoff value for when the Launcher displays the Partner row as a single
     // row, or a two row grid. Can be used for correctly positioning the partner
     // app entries.
     private int mRowCutoff = 0;
diff --git a/apps/LeanbackWidget/res/drawable-hdpi/ic_widget_ethernet_not_connected.png b/apps/LeanbackWidget/res/drawable-hdpi/ic_widget_ethernet_not_connected.png
new file mode 100644
index 0000000..df02569
--- /dev/null
+++ b/apps/LeanbackWidget/res/drawable-hdpi/ic_widget_ethernet_not_connected.png
diff --git a/apps/LeanbackWidget/res/drawable-hdpi/ic_widget_wifi_no_internet.png b/apps/LeanbackWidget/res/drawable-hdpi/ic_widget_wifi_no_internet.png
index d10c2fe..1b891de 100644
--- a/apps/LeanbackWidget/res/drawable-hdpi/ic_widget_wifi_no_internet.png
+++ b/apps/LeanbackWidget/res/drawable-hdpi/ic_widget_wifi_no_internet.png
diff --git a/apps/LeanbackWidget/res/drawable-hdpi/ic_widget_wifi_not_connected.png b/apps/LeanbackWidget/res/drawable-hdpi/ic_widget_wifi_not_connected.png
index c5d897f..d6d4a30 100644
--- a/apps/LeanbackWidget/res/drawable-hdpi/ic_widget_wifi_not_connected.png
+++ b/apps/LeanbackWidget/res/drawable-hdpi/ic_widget_wifi_not_connected.png
diff --git a/apps/LeanbackWidget/res/drawable-mdpi/ic_widget_ethernet_not_connected.png b/apps/LeanbackWidget/res/drawable-mdpi/ic_widget_ethernet_not_connected.png
new file mode 100644
index 0000000..ece1478
--- /dev/null
+++ b/apps/LeanbackWidget/res/drawable-mdpi/ic_widget_ethernet_not_connected.png
diff --git a/apps/LeanbackWidget/res/drawable-mdpi/ic_widget_wifi_no_internet.png b/apps/LeanbackWidget/res/drawable-mdpi/ic_widget_wifi_no_internet.png
index 6278694..5054b40 100644
--- a/apps/LeanbackWidget/res/drawable-mdpi/ic_widget_wifi_no_internet.png
+++ b/apps/LeanbackWidget/res/drawable-mdpi/ic_widget_wifi_no_internet.png
diff --git a/apps/LeanbackWidget/res/drawable-mdpi/ic_widget_wifi_not_connected.png b/apps/LeanbackWidget/res/drawable-mdpi/ic_widget_wifi_not_connected.png
index b10715f..ad53107 100644
--- a/apps/LeanbackWidget/res/drawable-mdpi/ic_widget_wifi_not_connected.png
+++ b/apps/LeanbackWidget/res/drawable-mdpi/ic_widget_wifi_not_connected.png
diff --git a/apps/LeanbackWidget/res/drawable-xhdpi/ic_widget_ethernet_not_connected.png b/apps/LeanbackWidget/res/drawable-xhdpi/ic_widget_ethernet_not_connected.png
new file mode 100644
index 0000000..5d0bfb9
--- /dev/null
+++ b/apps/LeanbackWidget/res/drawable-xhdpi/ic_widget_ethernet_not_connected.png
diff --git a/apps/LeanbackWidget/res/drawable-xhdpi/ic_widget_wifi_no_internet.png b/apps/LeanbackWidget/res/drawable-xhdpi/ic_widget_wifi_no_internet.png
index d676467..909d020 100644
--- a/apps/LeanbackWidget/res/drawable-xhdpi/ic_widget_wifi_no_internet.png
+++ b/apps/LeanbackWidget/res/drawable-xhdpi/ic_widget_wifi_no_internet.png
diff --git a/apps/LeanbackWidget/res/drawable-xhdpi/ic_widget_wifi_not_connected.png b/apps/LeanbackWidget/res/drawable-xhdpi/ic_widget_wifi_not_connected.png
index c0e0877..c892b26 100644
--- a/apps/LeanbackWidget/res/drawable-xhdpi/ic_widget_wifi_not_connected.png
+++ b/apps/LeanbackWidget/res/drawable-xhdpi/ic_widget_wifi_not_connected.png
diff --git a/apps/LeanbackWidget/res/drawable-xxhdpi/ic_widget_ethernet_not_connected.png b/apps/LeanbackWidget/res/drawable-xxhdpi/ic_widget_ethernet_not_connected.png
new file mode 100644
index 0000000..edb5a69
--- /dev/null
+++ b/apps/LeanbackWidget/res/drawable-xxhdpi/ic_widget_ethernet_not_connected.png
diff --git a/apps/LeanbackWidget/res/drawable-xxhdpi/ic_widget_wifi_no_internet.png b/apps/LeanbackWidget/res/drawable-xxhdpi/ic_widget_wifi_no_internet.png
deleted file mode 100644
index 0a5af3a..0000000
--- a/apps/LeanbackWidget/res/drawable-xxhdpi/ic_widget_wifi_no_internet.png
+++ /dev/null
diff --git a/apps/LeanbackWidget/res/drawable-xxhdpi/ic_widget_wifi_not_connected.png b/apps/LeanbackWidget/res/drawable-xxhdpi/ic_widget_wifi_not_connected.png
deleted file mode 100644
index e6475b7..0000000
--- a/apps/LeanbackWidget/res/drawable-xxhdpi/ic_widget_wifi_not_connected.png
+++ /dev/null
diff --git a/apps/LeanbackWidget/res/layout/clock_widget.xml b/apps/LeanbackWidget/res/layout/clock_widget.xml
index f86baa0..1ad5328 100644
--- a/apps/LeanbackWidget/res/layout/clock_widget.xml
+++ b/apps/LeanbackWidget/res/layout/clock_widget.xml
@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:alpha="@raw/icon_alpha">
+    android:layout_height="match_parent" >
 
     <TextClock
         android:id="@+id/clock"
-        android:layout_width="wrap_content"
+        android:layout_width="@dimen/clock_width"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
+        android:gravity="center_vertical|end"
         android:format12Hour="@string/widget_12_hours_format"
         android:format24Hour="@string/widget_24_hours_format"
         android:fontFamily="@string/light_font"
+        android:includeFontPadding="false"
         android:textColor="@color/clock_text_color"
         android:textSize="@dimen/clock_text_size" />
 
     <ImageView
         android:id="@+id/connectivity_indicator"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="@dimen/connectivity_status_size"
+        android:layout_height="@dimen/connectivity_status_size"
         android:layout_toStartOf="@+id/clock"
-        android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
         android:src="@null" />
 
diff --git a/apps/LeanbackWidget/res/values/config.xml b/apps/LeanbackWidget/res/values/config.xml
index fa319d1..9e4f1ba 100644
--- a/apps/LeanbackWidget/res/values/config.xml
+++ b/apps/LeanbackWidget/res/values/config.xml
@@ -11,5 +11,4 @@
     <string name="widget_12_hours_format" translatable="false">h:mm</string>
     <string name="widget_24_hours_format" translatable="false">kk:mm</string>
 
-    <item name="icon_alpha" format="float" type="raw">0.6</item>
 </resources>
diff --git a/apps/LeanbackWidget/res/values/dimens.xml b/apps/LeanbackWidget/res/values/dimens.xml
index 7c04e7c..fc54e72 100644
--- a/apps/LeanbackWidget/res/values/dimens.xml
+++ b/apps/LeanbackWidget/res/values/dimens.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="clock_text_size">32sp</dimen>
+    <dimen name="clock_text_size">36sp</dimen>
+    <dimen name="clock_width">106dp</dimen>
+    <dimen name="connectivity_status_size">32dp</dimen>
 </resources>