Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52713bea authored by Diego Perez's avatar Diego Perez Committed by Android (Google) Code Review
Browse files

Merge "Inline some of the files into the tests"

parents 5e7d2af8 0c06555d

tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/adaptive_icon.xml

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

              android:padding="16dp"

              android:orientation="horizontal"

              android:layout_width="fill_parent"

              android:layout_height="fill_parent">

    <ImageView

             android:layout_height="wrap_content"

             android:layout_width="wrap_content"

             android:src="@drawable/adaptive" />



</LinearLayout>

tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/indeterminate_progressbar.xml

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

              android:padding="16dp"

              android:orientation="horizontal"

              android:layout_width="fill_parent"

              android:layout_height="fill_parent">



    <ProgressBar

             android:layout_height="fill_parent"

             android:layout_width="fill_parent" />



</LinearLayout>

tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/insets.xml

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

              android:padding="16dp"

              android:orientation="horizontal"

              android:layout_width="wrap_content"

              android:layout_height="wrap_content">



    <com.android.layoutlib.test.myapplication.widgets.InsetsWidget

        android:text="Hello world"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:id="@+id/text1"/>

</LinearLayout>

tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/simple_activity.xml

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2016 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:paddingLeft="@dimen/activity_horizontal_margin"

                android:paddingRight="@dimen/activity_horizontal_margin"

                android:paddingTop="@dimen/activity_vertical_margin"

                android:paddingBottom="@dimen/activity_vertical_margin">



    <TextView

        android:text="@string/hello_world"

        android:layout_width="wrap_content"

        android:layout_height="200dp"

        android:background="#FF0000"

        android:id="@+id/text1"/>



</RelativeLayout>
 
 No newline at end of file

tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/vector_drawable.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!--

  ~ Copyright (C) 2015 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

              android:padding="16dp"

              android:orientation="horizontal"

              android:layout_width="fill_parent"

              android:layout_height="fill_parent">

    <ImageView

             android:layout_height="fill_parent"

             android:layout_width="fill_parent"

             android:src="@drawable/multi_path" />



</LinearLayout>