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

Commit 72093371 authored by Yang Li's avatar Yang Li Committed by The Android Open Source Project
Browse files

am f8173411: Squashed commit of the following: 

Merge commit 'f8173411'

* commit 'f8173411':
  Squashed commit of the following:
parents ce31b236 f8173411

tests/sketch/AndroidManifest.xml

+11 −3
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project

<!-- Copyright (C) 2008-2009 The Android Open Source Project





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

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

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

     you may not use this file except in compliance with the License.
@@ -14,11 +14,12 @@ 
     limitations under the License.

     limitations under the License.

-->

-->

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

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

      package="com.android.gesture"

      package="com.android.gesture.example"

      android:versionCode="1"

      android:versionCode="1"

      android:versionName="1.0.0">

      android:versionName="1.0.0">

      <uses-permission android:name="android.permission.READ_CONTACTS" />

      <application android:icon="@drawable/icon" android:label="@string/app_name">

      <application android:icon="@drawable/icon" android:label="@string/app_name">

        <activity android:name="com.android.gesture.example.GestureEntryDemo"

        <activity android:name="com.android.gesture.example.GestureEntry"

                  android:label="@string/app_name">

                  android:label="@string/app_name">

            <intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.intent.action.MAIN" />
@@ -26,5 +27,12 @@ 
            </intent-filter>

            </intent-filter>

        </activity>

        </activity>

        <activity android:name="com.android.gesture.example.GestureLibViewer"/>

        <activity android:name="com.android.gesture.example.GestureLibViewer"/>

        <activity android:name="com.android.gesture.example.ContactListGestureOverlay"

                  android:label="@string/overlay_name">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>

    </application>

    </application>

</manifest> 
</manifest>

tests/sketch/res/layout/demo.xml

100755 → 100644
+3 −2
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project

<!-- Copyright (C) 2009 The Android Open Source Project





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

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

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

     you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@ 
     See the License for the specific language governing permissions and

     See the License for the specific language governing permissions and

     limitations under the License.

     limitations under the License.

-->

-->



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

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

    android:orientation="vertical"

    android:orientation="vertical"

    android:layout_width="fill_parent"

    android:layout_width="fill_parent"
@@ -24,7 +25,7 @@ 
        android:drawSelectorOnTop="true"

        android:drawSelectorOnTop="true"

        android:prompt="@string/recognition_result"/>

        android:prompt="@string/recognition_result"/>

    

    

    <com.android.gesture.GesturePad 

    <com.android.gesture.GestureOverlay 

        android:id="@+id/drawingpad"

        android:id="@+id/drawingpad"

        android:layout_width="fill_parent"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

tests/sketch/res/layout/gestureviewer.xml

100755 → 100644
+3 −2
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project

<!-- Copyright (C) 2009 The Android Open Source Project





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

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

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

     you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@ 
     See the License for the specific language governing permissions and

     See the License for the specific language governing permissions and

     limitations under the License.

     limitations under the License.

-->

-->



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

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

    android:orientation="vertical"

    android:orientation="vertical"

    android:layout_width="fill_parent"

    android:layout_width="fill_parent"
@@ -25,7 +26,7 @@ 
        android:drawSelectorOnTop="true"

        android:drawSelectorOnTop="true"

        android:prompt="@string/recognition_result"/>

        android:prompt="@string/recognition_result"/>

    

    

    <com.android.gesture.GesturePad 

    <com.android.gesture.GestureOverlay 

        android:id="@+id/drawingpad"

        android:id="@+id/drawingpad"

        android:layout_width="fill_parent"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

tests/sketch/res/layout/newgesture_dialog.xml

100755 → 100644
+1 −1
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project

<!-- Copyright (C) 2009 The Android Open Source Project





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

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

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

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

tests/sketch/res/layout/overlaydemo.xml

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

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

    android:orientation="vertical"

    android:layout_width="fill_parent"

    android:layout_height="fill_parent"

    >

    <ListView

      android:id="@+id/list" 

      android:layout_width="fill_parent" 

      android:layout_height="0dip"

      android:layout_weight="1"/>

</LinearLayout>