From 1a55f95d45d2be39f3206cf1a4c3a1affd98cd92 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Thu, 21 Feb 2013 15:31:09 -0800
Subject: Explicit GridLayout alignment to fix warnings.

Also show lockdown VPN dialog whenever relaunched.

Change-Id: Ib8aecbd4a7f9d61906f65fee39f1e819c79aabb4
---
 res/layout/app_ops_details_item.xml     | 3 ++-
 res/layout/app_ops_item.xml             | 3 ++-
 res/layout/app_percentage_item.xml      | 4 ++--
 res/layout/manage_applications_item.xml | 3 ++-
 res/layout/running_processes_item.xml   | 2 +-
 res/layout/title.xml                    | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'res')

diff --git a/res/layout/app_ops_details_item.xml b/res/layout/app_ops_details_item.xml
index a0434fc..c630ad6 100644
--- a/res/layout/app_ops_details_item.xml
+++ b/res/layout/app_ops_details_item.xml
@@ -53,13 +53,14 @@
         android:id="@+id/op_time"
         android:layout_column="1"
         android:layout_row="1"
-        android:layout_gravity="fill_horizontal"
+        android:layout_gravity="fill_horizontal|top"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textAlignment="viewStart" />
 
     <Switch android:id="@+id/switchWidget"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
         android:layout_marginStart="8dip"
         android:layout_column="2"
         android:layout_row="0"
diff --git a/res/layout/app_ops_item.xml b/res/layout/app_ops_item.xml
index f42a8b9..8d21456 100644
--- a/res/layout/app_ops_item.xml
+++ b/res/layout/app_ops_item.xml
@@ -50,13 +50,14 @@
     <TextView
         android:id="@+id/op_name"
         android:layout_width="0dip"
-        android:layout_gravity="fill_horizontal"
+        android:layout_gravity="fill_horizontal|top"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textAlignment="viewStart" />
 
     <TextView
         android:id="@+id/op_time"
         android:layout_marginStart="8dip"
+        android:layout_gravity="top"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
 </GridLayout>
diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml
index 8bdbadb..f966d20 100644
--- a/res/layout/app_percentage_item.xml
+++ b/res/layout/app_percentage_item.xml
@@ -52,7 +52,7 @@
         android:id="@android:id/progress"
         android:layout_height="12dip"
         android:layout_columnSpan="2"
-        android:layout_gravity="fill_horizontal"
+        android:layout_gravity="fill_horizontal|top"
         android:layout_marginTop="4dip"
         android:max="100"
         android:progressDrawable="@drawable/data_usage_bar"
@@ -61,7 +61,7 @@
     <TextView
         android:id="@android:id/summary"
         android:layout_width="0dip"
-        android:layout_gravity="fill_horizontal"
+        android:layout_gravity="fill_horizontal|top"
         android:layout_columnSpan="2"
         android:layout_marginTop="4dip"
         android:visibility="gone"
diff --git a/res/layout/manage_applications_item.xml b/res/layout/manage_applications_item.xml
index f471f55..bf93840 100755
--- a/res/layout/manage_applications_item.xml
+++ b/res/layout/manage_applications_item.xml
@@ -58,13 +58,14 @@
     <TextView
         android:id="@+id/app_size"
         android:layout_width="0dip"
-        android:layout_gravity="fill_horizontal"
+        android:layout_gravity="fill_horizontal|top"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textAlignment="viewStart" />
 
     <TextView
         android:id="@+id/app_disabled"
         android:layout_marginStart="8dip"
+        android:layout_gravity="top"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
 </GridLayout>
diff --git a/res/layout/running_processes_item.xml b/res/layout/running_processes_item.xml
index e64b594..52cecf6 100644
--- a/res/layout/running_processes_item.xml
+++ b/res/layout/running_processes_item.xml
@@ -62,7 +62,7 @@
 
     <LinearLayout
         android:layout_width="0dip"
-        android:layout_gravity="fill_horizontal">
+        android:layout_gravity="fill_horizontal|top">
 
         <TextView
             android:id="@+id/description"
diff --git a/res/layout/title.xml b/res/layout/title.xml
index 0c2084b..46b2115 100644
--- a/res/layout/title.xml
+++ b/res/layout/title.xml
@@ -54,7 +54,7 @@
     <TextView
         android:id="@+id/provider_id"
         android:layout_width="0dip"
-        android:layout_gravity="fill_horizontal"
+        android:layout_gravity="fill_horizontal|top"
         android:singleLine="true"
         android:ellipsize="marquee"
         android:textAppearance="?android:attr/textAppearanceSmall"
-- 
cgit v1.1