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

Commit 4398876d authored by Mathias Agopian's avatar Mathias Agopian
Browse files

merge master to master_gl

parents 9d17c057 6ec711f4

api/current.xml

+499 −55
Original line number Diff line number Diff line
@@ -309,6 +309,17 @@ 
 visibility="public"

>

</field>

<field name="CHANGE_WIFI_MULTICAST_STATE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.permission.CHANGE_WIFI_MULTICAST_STATE&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CHANGE_WIFI_STATE"

 type="java.lang.String"

 transient="false"
@@ -49569,10 +49580,75 @@ 
>

</field>

</class>

<class name="GestureLibrary"

<class name="GestureLibraries"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<method name="fromFile"

 return="android.gesture.GestureLibrary"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="path" type="java.lang.String">

</parameter>

</method>

<method name="fromFile"

 return="android.gesture.GestureLibrary"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="path" type="java.io.File">

</parameter>

</method>

<method name="fromPrivateFile"

 return="android.gesture.GestureLibrary"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="name" type="java.lang.String">

</parameter>

</method>

<method name="fromRawResource"

 return="android.gesture.GestureLibrary"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="resourceId" type="int">

</parameter>

</method>

</class>

<class name="GestureLibrary"

 extends="java.lang.Object"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"
@@ -49582,10 +49658,8 @@ 
 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

 visibility="protected"

>

<parameter name="path" type="java.lang.String">

</parameter>

</constructor>

<method name="addGesture"

 return="void"
@@ -49626,6 +49700,17 @@ 
<parameter name="entryName" type="java.lang.String">

</parameter>

</method>

<method name="getLearner"

 return="android.gesture.Learner"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getOrientationStyle"

 return="int"

 abstract="false"
@@ -49648,7 +49733,7 @@ 
 visibility="public"

>

</method>

<method name="load"

<method name="isReadOnly"

 return="boolean"

 abstract="false"

 native="false"
@@ -49659,6 +49744,17 @@ 
 visibility="public"

>

</method>

<method name="load"

 return="boolean"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="recognize"

 return="java.util.ArrayList&lt;android.gesture.Prediction&gt;"

 abstract="false"
@@ -49702,7 +49798,7 @@ 
</method>

<method name="save"

 return="boolean"

 abstract="false"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"
@@ -49737,48 +49833,14 @@ 
<parameter name="type" type="int">

</parameter>

</method>

<field name="ORIENTATION_INVARIANT"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ORIENTATION_SENSITIVE"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SEQUENCE_INVARIANT"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SEQUENCE_SENSITIVE"

 type="int"

<field name="mStore"

 type="android.gesture.GestureStore"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

 visibility="protected"

>

</field>

</class>
@@ -50410,6 +50472,259 @@ 
>

</field>

</class>

<class name="GestureStore"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="GestureStore"

 type="android.gesture.GestureStore"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<method name="addGesture"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="entryName" type="java.lang.String">

</parameter>

<parameter name="gesture" type="android.gesture.Gesture">

</parameter>

</method>

<method name="getGestureEntries"

 return="java.util.Set&lt;java.lang.String&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getGestures"

 return="java.util.ArrayList&lt;android.gesture.Gesture&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="entryName" type="java.lang.String">

</parameter>

</method>

<method name="getOrientationStyle"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getSequenceType"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="load"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="stream" type="java.io.InputStream">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="load"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="stream" type="java.io.InputStream">

</parameter>

<parameter name="closeStream" type="boolean">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="recognize"

 return="java.util.ArrayList&lt;android.gesture.Prediction&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="gesture" type="android.gesture.Gesture">

</parameter>

</method>

<method name="removeEntry"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="entryName" type="java.lang.String">

</parameter>

</method>

<method name="removeGesture"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="entryName" type="java.lang.String">

</parameter>

<parameter name="gesture" type="android.gesture.Gesture">

</parameter>

</method>

<method name="save"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="stream" type="java.io.OutputStream">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="save"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="stream" type="java.io.OutputStream">

</parameter>

<parameter name="closeStream" type="boolean">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="setOrientationStyle"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="style" type="int">

</parameter>

</method>

<method name="setSequenceType"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="type" type="int">

</parameter>

</method>

<field name="ORIENTATION_INVARIANT"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ORIENTATION_SENSITIVE"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SEQUENCE_INVARIANT"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SEQUENCE_SENSITIVE"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="GestureStroke"

 extends="java.lang.Object"

 abstract="false"
@@ -50510,6 +50825,15 @@ 
>

</field>

</class>

<class name="Learner"

 extends="java.lang.Object"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility=""

>

</class>

<class name="LetterRecognizer"

 extends="java.lang.Object"

 abstract="false"
@@ -50518,19 +50842,17 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<method name="getLetterRecognizer"

 return="android.gesture.LetterRecognizer"

<method name="recognize"

 return="java.util.ArrayList&lt;android.gesture.Prediction&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="type" type="int">

<parameter name="gesture" type="android.gesture.Gesture">

</parameter>

</method>

<method name="recognize"
@@ -50545,20 +50867,85 @@ 
>

<parameter name="gesture" type="android.gesture.Gesture">

</parameter>

<parameter name="predictions" type="java.util.ArrayList&lt;android.gesture.Prediction&gt;">

</parameter>

</method>

<method name="recognize"

 return="java.util.ArrayList&lt;android.gesture.Prediction&gt;"

</class>

<class name="LetterRecognizers"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<method name="fromFile"

 return="android.gesture.LetterRecognizer"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="gesture" type="android.gesture.Gesture">

<parameter name="path" type="java.lang.String">

</parameter>

<parameter name="predictions" type="java.util.ArrayList&lt;android.gesture.Prediction&gt;">

</method>

<method name="fromFile"

 return="android.gesture.LetterRecognizer"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="file" type="java.io.File">

</parameter>

</method>

<method name="fromResource"

 return="android.gesture.LetterRecognizer"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="resourceId" type="int">

</parameter>

</method>

<method name="fromStream"

 return="android.gesture.LetterRecognizer"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="stream" type="java.io.InputStream">

</parameter>

</method>

<method name="fromType"

 return="android.gesture.LetterRecognizer"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="type" type="int">

</parameter>

</method>

<field name="RECOGNIZER_LATIN_LOWERCASE"
@@ -80263,6 +80650,19 @@ 
<parameter name="rssiB" type="int">

</parameter>

</method>

<method name="createMulticastLock"

 return="android.net.wifi.WifiManager.MulticastLock"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="tag" type="java.lang.String">

</parameter>

</method>

<method name="createWifiLock"

 return="android.net.wifi.WifiManager.WifiLock"

 abstract="false"
@@ -80755,6 +81155,48 @@ 
>

</field>

</class>

<class name="WifiManager.MulticastLock"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="acquire"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isHeld"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="release"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

</class>

<class name="WifiManager.WifiLock"

 extends="java.lang.Object"

 abstract="false"
@@ -96912,6 +97354,8 @@ 
</parameter>

<parameter name="length" type="int">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>

</constructor>

<method name="allowPurging"

 return="boolean"

core/java/android/content/pm/PackageParser.java

+6 −4
Original line number Diff line number Diff line
@@ -74,10 +74,12 @@ public class PackageParser { 
     * added to older SDKs appearing before those added to newer SDKs.

     * @hide

     */

    public static final PackageParser.NewPermissionInfo NEW_PERMISSIONS[] = new PackageParser.NewPermissionInfo[] {

    public static final PackageParser.NewPermissionInfo NEW_PERMISSIONS[] =

        new PackageParser.NewPermissionInfo[] {

            new PackageParser.NewPermissionInfo(android.Manifest.permission.WRITE_SDCARD,

                android.os.Build.VERSION_CODES.DONUT,

                0)

                    android.os.Build.VERSION_CODES.DONUT, 0),

            new PackageParser.NewPermissionInfo(android.Manifest.permission.READ_PHONE_STATE,

                    android.os.Build.VERSION_CODES.DONUT, 0)

    };



    private String mArchiveSourcePath;

core/java/android/gesture/Gesture.java

+2 −7
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class Gesture implements Parcelable { 


    private static int sGestureCount = 0;



    private RectF mBoundingBox;

    private final RectF mBoundingBox = new RectF();



    // the same as its instance ID

    private long mGestureID;
@@ -83,13 +83,8 @@ public class Gesture implements Parcelable { 
     */

    public void addStroke(GestureStroke stroke) {

        mStrokes.add(stroke);



        if (mBoundingBox == null) {

            mBoundingBox = new RectF(stroke.boundingBox);

        } else {

        mBoundingBox.union(stroke.boundingBox);

    }

    }



    /**

     * Get the total length of the gesture. When there are multiple strokes in

core/java/android/gesture/GestureLibraries.java

0 → 100644
+139 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 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.

 */



package android.gesture;



import android.util.Log;

import static android.gesture.GestureConstants.*;

import android.content.Context;



import java.io.File;

import java.io.FileOutputStream;

import java.io.FileNotFoundException;

import java.io.IOException;

import java.io.FileInputStream;

import java.io.InputStream;

import java.lang.ref.WeakReference;



public final class GestureLibraries {

    private GestureLibraries() {

    }



    public static GestureLibrary fromFile(String path) {

        return fromFile(new File(path));

    }



    public static GestureLibrary fromFile(File path) {

        return new FileGestureLibrary(path);

    }



    public static GestureLibrary fromPrivateFile(Context context, String name) {

        return fromFile(context.getFileStreamPath(name));

    }



    public static GestureLibrary fromRawResource(Context context, int resourceId) {

        return new ResourceGestureLibrary(context, resourceId);

    }



    private static class FileGestureLibrary extends GestureLibrary {

        private final File mPath;



        public FileGestureLibrary(File path) {

            mPath = path;

        }



        @Override

        public boolean isReadOnly() {

            return !mPath.canWrite();

        }



        public boolean save() {

            final File file = mPath;

            if (!file.canWrite()) return false;



            if (!file.getParentFile().exists()) {

                if (!file.getParentFile().mkdirs()) {

                    return false;

                }

            }



            boolean result = false;

            try {

                mStore.save(new FileOutputStream(file), true);

                result = true;

            } catch (FileNotFoundException e) {

                Log.d(LOG_TAG, "Could not save the gesture library in " + mPath, e);

            } catch (IOException e) {

                Log.d(LOG_TAG, "Could not save the gesture library in " + mPath, e);

            }



            return result;

        }



        public boolean load() {

            boolean result = false;

            final File file = mPath;

            if (file.exists() && file.canRead()) {

                try {

                    mStore.load(new FileInputStream(file), true);

                    result = true;

                } catch (FileNotFoundException e) {

                    Log.d(LOG_TAG, "Could not load the gesture library from " + mPath, e);

                } catch (IOException e) {

                    Log.d(LOG_TAG, "Could not load the gesture library from " + mPath, e);

                }

            }



            return result;

        }

    }



    private static class ResourceGestureLibrary extends GestureLibrary {

        private final WeakReference<Context> mContext;

        private final int mResourceId;



        public ResourceGestureLibrary(Context context, int resourceId) {

            mContext = new WeakReference<Context>(context);

            mResourceId = resourceId;

        }



        @Override

        public boolean isReadOnly() {

            return true;

        }



        public boolean save() {

            return false;

        }



        public boolean load() {

            boolean result = false;

            final Context context = mContext.get();

            if (context != null) {

                final InputStream in = context.getResources().openRawResource(mResourceId);

                try {

                    mStore.load(in, true);

                    result = true;

                } catch (IOException e) {

                    Log.d(LOG_TAG, "Could not load the gesture library from raw resource " +

                            context.getResources().getResourceName(mResourceId), e);

                }

            }



            return result;

        }

    }

}

core/java/android/gesture/GestureLibrary.java

+25 −290

File changed.

Preview size limit exceeded, changes collapsed.