Deprecate fill_parent and introduce match_parent.

Bug: #2361749.

diff --git a/res/layout/attach_camera_control.xml b/res/layout/attach_camera_control.xml
index f4650b4..7653723 100644 (file)
--- a/res/layout/attach_camera_control.xml
+++ b/res/layout/attach_camera_control.xml
@@ -17,7 +17,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
         android:id="@+id/control_bar"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:layout_width="76dp"
         android:layout_marginTop="13dp"
         android:layout_marginBottom="10dp"
@@ -27,7 +27,7 @@
             android:layout_alignParentTop="true"
             android:layout_centerHorizontal="true"
             android:layout_height="wrap_content"
-            android:layout_width="fill_parent">
+            android:layout_width="match_parent">
         <LinearLayout style="@style/ReviewControlGroup"
                 android:layout_marginBottom="15dp">
             <ImageView style="@style/ReviewControlIcon"

diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index 199208f..d1c1336 100644 (file)
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -19,27 +19,27 @@
         android:background="@drawable/camera_background"
         android:id="@+id/camera"
         android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
     <com.android.camera.PreviewFrameLayout android:id="@+id/frame_layout"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_weight="1">
         <ImageView android:id="@+id/btn_gripper"
                 android:background="@drawable/btn_gripper"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
         <FrameLayout android:id="@+id/frame"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:background="@drawable/border_view_finder">
             <SurfaceView android:id="@+id/camera_preview"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"/>
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"/>
             <com.android.camera.FocusRectangle
                     android:id="@+id/focus_rectangle"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"/>
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"/>
             <LinearLayout android:id="@+id/indicator_bar"
                     android:orientation="vertical"
                     android:visibility="visible"

diff --git a/res/layout/camera_control.xml b/res/layout/camera_control.xml
index 6b84ad2..2744f32 100644 (file)
--- a/res/layout/camera_control.xml
+++ b/res/layout/camera_control.xml
@@ -17,7 +17,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/control_bar"
         android:orientation="vertical"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:layout_width="76dp"
         android:layout_marginTop="13dp"
         android:layout_marginBottom="10dp"

diff --git a/res/layout/detailsview.xml b/res/layout/detailsview.xml
index ff32f91..f799afd 100644 (file)
--- a/res/layout/detailsview.xml
+++ b/res/layout/detailsview.xml
@@ -17,10 +17,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/scroll_view"
     android:orientation="vertical"
     android:layout_width="300dip"
-    android:layout_height="fill_parent">
+    android:layout_height="match_parent">
 
     <LinearLayout android:orientation="vertical"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingLeft="5dip"
             android:paddingRight="5dip"
@@ -28,7 +28,7 @@
 
         <LinearLayout android:orientation="horizontal"
                 android:gravity="center_vertical"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
             <LinearLayout android:orientation="horizontal"
@@ -48,7 +48,7 @@
                     android:layout_weight="1"/>
 
         </LinearLayout>
-        <TableLayout android:layout_width="fill_parent"
+        <TableLayout android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="5dip"
                 android:layout_marginTop="10dip">
@@ -69,7 +69,7 @@
                         android:text="@string/details_image_resolution"/>
                 <TextView android:id="@+id/details_resolution_value"
                         android:layout_height="wrap_content"
-                        android:layout_width="fill_parent"
+                        android:layout_width="match_parent"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:paddingLeft="5dip"
                         android:textColor="?android:attr/textColorPrimary"/>
@@ -80,7 +80,7 @@
                         android:text="@string/details_image_make"/>
                 <TextView android:id="@+id/details_make_value"
                         android:layout_height="wrap_content"
-                        android:layout_width="fill_parent"
+                        android:layout_width="match_parent"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:paddingLeft="5dip"
                         android:textColor="?android:attr/textColorPrimary"/>
@@ -91,7 +91,7 @@
                         android:text="@string/details_image_model"/>
                 <TextView android:id="@+id/details_model_value"
                         android:layout_height="wrap_content"
-                        android:layout_width="fill_parent"
+                        android:layout_width="match_parent"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:paddingLeft="5dip"
                         android:textColor="?android:attr/textColorPrimary"/>
@@ -102,7 +102,7 @@
                         android:text="@string/details_image_whitebalance"/>
                 <TextView android:id="@+id/details_whitebalance_value"
                         android:layout_height="wrap_content"
-                        android:layout_width="fill_parent"
+                        android:layout_width="match_parent"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:paddingLeft="5dip"
                         android:textColor="?android:attr/textColorPrimary"/>
@@ -113,7 +113,7 @@
                         android:text="@string/details_image_latitude"/>
                 <TextView android:id="@+id/details_latitude_value"
                         android:layout_height="wrap_content"
-                        android:layout_width="fill_parent"
+                        android:layout_width="match_parent"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:paddingLeft="5dip"
                         android:textColor="?android:attr/textColorPrimary"/>
@@ -124,7 +124,7 @@
                         android:text="@string/details_image_longitude"/>
                 <TextView android:id="@+id/details_longitude_value"
                         android:layout_height="wrap_content"
-                        android:layout_width="fill_parent"
+                        android:layout_width="match_parent"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:paddingLeft="5dip"
                         android:textColor="?android:attr/textColorPrimary"/>
@@ -135,7 +135,7 @@
                         android:text="@string/details_image_location"/>
                 <TextView android:id="@+id/details_location_value"
                         android:layout_height="wrap_content"
-                        android:layout_width="fill_parent"
+                        android:layout_width="match_parent"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:paddingLeft="5dip"
                         android:textColor="?android:attr/textColorPrimary"/>

diff --git a/res/layout/on_screen_hint.xml b/res/layout/on_screen_hint.xml
index a56b728..312ff6d 100644 (file)
--- a/res/layout/on_screen_hint.xml
+++ b/res/layout/on_screen_hint.xml
@@ -18,8 +18,8 @@
 -->
 
 <LinearLayout 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"
     android:orientation="vertical"
     android:background="@drawable/on_screen_hint_frame">
 

diff --git a/res/layout/on_screen_menu.xml b/res/layout/on_screen_menu.xml
index 3ae6b7a..f80a846 100644 (file)
--- a/res/layout/on_screen_menu.xml
+++ b/res/layout/on_screen_menu.xml
@@ -17,22 +17,22 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/main_panel"
         android:background="@drawable/camera_background"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content">
-    <FrameLayout android:layout_width="fill_parent"
+    <FrameLayout android:layout_width="match_parent"
             android:background="@android:color/black"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:layout_toLeftOf="@+id/btn_gripper">
         <ListView android:id="@+id/menu_view"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent" />
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
         <ListView android:id="@+id/sub_menu"
                 android:visibility="invisible"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent" />
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
     </FrameLayout>
     <ImageView android:id="@+id/btn_gripper"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:layout_width="wrap_content"
             android:background="@drawable/gripper_handle"
             android:layout_alignParentRight="true"/>

diff --git a/res/layout/on_screen_menu_header.xml b/res/layout/on_screen_menu_header.xml
index f16f30e..29e9176 100644 (file)
--- a/res/layout/on_screen_menu_header.xml
+++ b/res/layout/on_screen_menu_header.xml
@@ -18,7 +18,7 @@
         android:background="#222"
         android:paddingLeft="5dp"
         android:paddingRight="5dp"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:singleLine="true" />

diff --git a/res/layout/on_screen_menu_list_item.xml b/res/layout/on_screen_menu_list_item.xml
index 42816bf..de83a4c 100644 (file)
--- a/res/layout/on_screen_menu_list_item.xml
+++ b/res/layout/on_screen_menu_list_item.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center_vertical"
@@ -22,7 +22,7 @@
         android:paddingLeft="10dp"
         android:paddingRight="5dp" >
     <TextView android:id="@+id/title"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:maxLines="2"
             android:ellipsize="end"
@@ -30,7 +30,7 @@
             android:fadingEdge="horizontal" />
 
     <TextView android:id="@+id/summary"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/title"
             android:layout_alignLeft="@id/title"

diff --git a/res/layout/on_screen_submenu_item.xml b/res/layout/on_screen_submenu_item.xml
index 0cb6660..9e84241 100644 (file)
--- a/res/layout/on_screen_submenu_item.xml
+++ b/res/layout/on_screen_submenu_item.xml
@@ -16,7 +16,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:paddingLeft="10dp"
         android:paddingRight="5dp"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeight"
         android:gravity="center_vertical" >
@@ -26,7 +26,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="0" />
-    <RelativeLayout android:layout_width="fill_parent"
+    <RelativeLayout android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center_vertical"
@@ -40,7 +40,7 @@
                 android:fadingEdge="horizontal" />
         <TextView android:id="@+id/summary"
                 android:visibility='gone'
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/title"
                 android:layout_alignLeft="@id/title"

diff --git a/res/layout/review_control.xml b/res/layout/review_control.xml
index a1291a5..fbab347 100644 (file)
--- a/res/layout/review_control.xml
+++ b/res/layout/review_control.xml
@@ -18,7 +18,7 @@
         xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
         android:id="@+id/button_bar"
         android:gravity="center_horizontal"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:layout_width="76dp"
         android:layout_marginTop="13dp"
         android:layout_marginBottom="10dp"
@@ -26,8 +26,8 @@
     <com.android.camera.EvenlySpacedLayout
             camera:orientation="vertical"
             camera:keepEndSpace="false"
-            android:layout_height="fill_parent"
-            android:layout_width="fill_parent">
+            android:layout_height="match_parent"
+            android:layout_width="match_parent">
         <LinearLayout style="@style/ReviewControlGroup">
             <ImageView style="@style/ReviewControlIcon"
                     android:id="@+id/btn_delete"

diff --git a/res/layout/review_image.xml b/res/layout/review_image.xml
index b5639e6..a27c90f 100644 (file)
--- a/res/layout/review_image.xml
+++ b/res/layout/review_image.xml
@@ -18,40 +18,40 @@
         android:background="@drawable/camera_background"
         android:id="@+id/root"
         android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
     <com.android.camera.PreviewFrameLayout android:id="@+id/frame_layout"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_weight="1">
         <FrameLayout android:id="@+id/frame"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:background="@drawable/border_view_finder">
             <RelativeLayout android:id="@+id/mainPanel"
                     android:layout_toLeftOf="@id/button_bar"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent">
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
                 <AbsoluteLayout android:id="@+id/slideShowContainer"
-                        android:layout_width="fill_parent"
-                        android:layout_height="fill_parent">
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
                     <com.android.camera.ImageViewTouch2 android:id="@+id/image1_slideShow"
                             android:background="#00000000"
-                            android:layout_width="fill_parent"
-                            android:layout_height="fill_parent" />
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent" />
                     <com.android.camera.ImageViewTouch2 android:id="@+id/image2_slideShow"
                             android:background="#00000000"
-                            android:layout_width="fill_parent"
-                            android:layout_height="fill_parent" />
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent" />
                 </AbsoluteLayout>
                 <AbsoluteLayout android:id="@+id/abs"
-                        android:layout_width="fill_parent"
-                        android:layout_height="fill_parent">
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
                     <com.android.camera.ImageViewTouch2 android:id="@+id/image"
                                 android:background="#FF000000"
                                 android:focusableInTouchMode="true"
-                                android:layout_width="fill_parent"
-                                android:layout_height="fill_parent" />
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent" />
                 </AbsoluteLayout>
                 <ImageView android:id="@+id/prev_image"
                         android:clickable="true"

diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml
index 85f7f07..780d4f5 100644 (file)
--- a/res/layout/video_camera.xml
+++ b/res/layout/video_camera.xml
@@ -19,26 +19,26 @@
         android:id="@+id/video_camera"
         android:background="@drawable/camera_background"
         android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
     <com.android.camera.PreviewFrameLayout android:id="@+id/frame_layout"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_weight="1">
         <ImageView android:id="@+id/btn_gripper"
                 android:background="@drawable/btn_gripper"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
         <FrameLayout android:id="@+id/frame"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:background="@drawable/border_view_finder">
             <SurfaceView android:id="@+id/camera_preview"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"/>
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"/>
             <ImageView android:id="@+id/video_frame"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
                     android:visibility="gone" />
             <!-- Note: In this TextView the paddingRight="2"
                  attribute is required because otherwise the

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2e09e45..fa1c690 100644 (file)
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -40,7 +40,7 @@
         <item name="android:gravity">center</item>
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">2</item>
-        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
     <style name="ReviewControlIcon">
@@ -55,7 +55,7 @@
         <item name="android:orientation">vertical</item>
         <item name="android:gravity">top|center_horizontal</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_width">match_parent</item>
     </style>
     <style name="NoEnterExitAnimation">
         <item name="android:windowEnterAnimation">@null</item>