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

Commit 791d9134 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Lockscreen gestures -"

parents 45af6849 1eacff67

AndroidManifest.xml

+33 −15
Original line number Diff line number Diff line
@@ -135,6 +135,24 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".activities.GestureMenuActivity">

            <intent-filter>

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

            </intent-filter>

        </activity>



        <activity android:name=".activities.GestureListActivity">

            <intent-filter>

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

            </intent-filter>

        </activity>



        <activity android:name=".activities.GestureCreateActivity">

            <intent-filter>

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

            </intent-filter>

        </activity>



        <receiver android:name=".provider.RenderFXWidgetProvider" android:label="@string/widget_name">

            <intent-filter>

                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

res/layout/gesture_create.xml

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

<!--

     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:layout_width="match_parent"

    android:layout_height="match_parent"



    android:orientation="vertical">



    <Button android:id="@+id/shortcut_picker"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:text="@string/gestures_shortcut_picker_button_label"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:onClick="pickShortcut" />



    <android.gesture.GestureOverlayView

        android:id="@+id/gestures_overlay"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1.0"



        android:gestureStrokeType="multiple" />



    <LinearLayout

        style="@android:style/ButtonBar"



        android:layout_width="match_parent"

        android:layout_height="wrap_content"



        android:orientation="horizontal">



        <Button

            android:id="@+id/done"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:enabled="false"

            android:onClick="addGesture"

            android:text="@string/gestures_button_done" />



        <Button

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:onClick="cancelGesture"

            android:text="@string/gestures_button_discard" />



    </LinearLayout>



</LinearLayout>

res/layout/gestures_item.xml

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

<!-- 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.

-->



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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"



    android:gravity="center_vertical"



    android:drawablePadding="12dip"

    android:paddingLeft="6dip"

    android:paddingRight="6dip"



    android:singleLine="false"

    android:textAppearance="?android:attr/textAppearanceSmall" />

res/layout/gestures_list.xml

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

<!--

     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:layout_width="match_parent"

    android:layout_height="match_parent"



    android:orientation="vertical">



    <ListView

        android:id="@android:id/list"



        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1.0" />



    <TextView

        android:id="@android:id/empty"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1.0"



        android:gravity="center"



        android:text="@string/gestures_loading"

        android:textAppearance="?android:attr/textAppearanceMedium" />



    <LinearLayout

        style="@android:style/ButtonBar"



        android:layout_width="match_parent"

        android:layout_height="wrap_content"



        android:orientation="horizontal">



        <Button

            android:id="@+id/addButton"

            android:onClick="addGesture"



            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1"



            android:enabled="false"

            android:text="@string/gestures_button_add" />



    </LinearLayout>



</LinearLayout>

res/values/arrays.xml

+30 −0
Original line number Diff line number Diff line
@@ -408,4 +408,34 @@ 
        <item>1</item>

    </string-array>



    <string-array name="pref_lockscreen_gestures_sensitivity_entries">

        <item>1 (broadest)</item>

        <item>2</item>

        <item>3</item>

        <item>4</item>

        <item>5</item>

        <item>6</item>

        <item>7</item>

        <item>8</item>

        <item>9</item>

        <item>10</item>

        <item>11</item>

        <item>12 (strictest)</item>

    </string-array>



    <string-array name="pref_lockscreen_gestures_sensitivity_values">

        <item>1</item>

        <item>2</item>

        <item>3</item>

        <item>4</item>

        <item>5</item>

        <item>6</item>

        <item>7</item>

        <item>8</item>

        <item>9</item>

        <item>10</item>

        <item>11</item>

        <item>12</item>

    </string-array>



</resources>