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

Commit 5ec1a5fa authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Move external input tile inclusion to device repo. 

Change-Id: I1afa10da1b9e0cc35c5198d1cbd5c13e2b4c343d
parent ef612a67

res/drawable/ic_settings_gestures.xml

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

<!--

    Copyright (c) 2015 The CyanogenMod 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.

-->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">



    <path

            android:fillColor="?android:attr/colorAccent"

            android:pathData="M4.7,6.9c0.7-0.7,1.4-1.4,1.7-1.2c0.5,0.2,0,1-0.3,1.5c-0.2,0.4-2.8,3.9-2.8,6.3c0,1.3,0.5,2.3,1.3,3

c0.7,0.6,1.7,0.7,2.6,0.5c1.1-0.3,1.9-1.4,3-2.8c1.2-1.5,2.8-3.4,4-3.4c1.6,0,1.6,1,1.7,1.8c-3.7,0.6-5.3,3.7-5.3,5.4

s1.4,3.1,3.2,3.1c1.6,0,4.3-1.3,4.6-6.1H21v-2.5h-2.4c-0.1-1.7-1.1-4.2-4-4.2c-2.2,0-4.1,1.9-4.9,2.8c-0.6,0.7-2,2.5-2.3,2.7

c-0.2,0.3-0.7,0.8-1.1,0.8c-0.4,0-0.7-0.8-0.4-1.9c0.3-1.1,1.4-2.9,1.8-3.5C8.5,8,9.1,7.2,9.1,5.9C9.1,3.7,7.4,3,6.6,3

C5.3,3,4.1,4,3.9,4.3C3.5,4.6,3.2,4.9,3,5.2L4.7,6.9z

M13.9,18.6c-0.3,0-0.7-0.3-0.7-0.7c0-0.6,0.7-2.2,2.8-2.8

C15.8,17.8,14.6,18.6,13.9,18.6z" />

</vector>

res/drawable/ic_settings_oclick.xml

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

<!--

     Copyright (C) 2015 The CyanogenMod 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.

-->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="?android:attr/colorAccent"

        android:pathData="M13.776,22.844c0.142-0.023,0.287-0.037,0.427-0.065c0.273-0.056,0.538-0.13,0.803-0.205

c0.08-0.023,0.163-0.038,0.243-0.062c0.316-0.097,0.624-0.212,0.927-0.337c0.024-0.01,0.05-0.017,0.075-0.027

C20.215,20.484,23,16.568,23,12c0-3.062-1.253-5.83-3.272-7.824l0,0c-0.003-0.003-0.006-0.005-0.008-0.007

c-0.743-0.733-1.588-1.361-2.515-1.86c-0.008-0.004-0.016-0.007-0.024-0.011c-0.302-0.162-0.611-0.311-0.929-0.444

c-0.043-0.018-0.088-0.03-0.13-0.048c-0.286-0.116-0.574-0.225-0.871-0.317c-0.097-0.03-0.199-0.049-0.298-0.077

c-0.247-0.069-0.494-0.139-0.748-0.191c-0.178-0.036-0.362-0.055-0.543-0.083c-0.181-0.027-0.359-0.064-0.542-0.082

C12.751,1.019,12.378,1,12,1s-0.751,0.019-1.119,0.056c-0.184,0.019-0.362,0.055-0.542,0.082c-0.181,0.028-0.365,0.047-0.543,0.083

C9.541,1.273,9.295,1.344,9.047,1.413C8.949,1.44,8.847,1.459,8.75,1.489c-0.309,0.096-0.61,0.208-0.906,0.33

C7.813,1.831,7.78,1.84,7.749,1.853c-0.325,0.136-0.642,0.288-0.95,0.454C6.798,2.308,6.797,2.308,6.796,2.309

C5.869,2.808,5.022,3.437,4.279,4.17C4.277,4.172,4.274,4.174,4.272,4.176l0,0C2.253,6.17,1,8.938,1,12

c0,4.568,2.785,8.485,6.75,10.147c0.02,0.009,0.042,0.014,0.063,0.023c0.307,0.126,0.619,0.242,0.939,0.341

c0.066,0.02,0.135,0.033,0.201,0.052c0.279,0.08,0.558,0.158,0.846,0.216c0.124,0.025,0.252,0.037,0.377,0.057

c0.235,0.039,0.468,0.083,0.708,0.107c0.292,0.029,0.59,0.039,0.888,0.045C11.847,22.99,11.922,23,12,23s0.153-0.01,0.23-0.012

c0.298-0.006,0.596-0.015,0.888-0.045C13.341,22.921,13.557,22.879,13.776,22.844z

M12,4.732c0.334,0,0.606,0.271,0.606,0.606

S12.334,5.943,12,5.943s-0.606-0.271-0.606-0.606S11.666,4.732,12,4.732z

M11.394,3.517c0-0.334,0.271-0.606,0.606-0.606

s0.606,0.271,0.606,0.606S12.334,4.122,12,4.122S11.394,3.851,11.394,3.517z

M12,6.553c0.334,0,0.606,0.271,0.606,0.606

S12.334,7.764,12,7.764s-0.606-0.271-0.606-0.606S11.666,6.553,12,6.553z

M12,8.373c0.334,0,0.606,0.271,0.606,0.606

c0,0.334-0.271,0.606-0.606,0.606s-0.606-0.271-0.606-0.606S11.666,8.373,12,8.373z

M12,10.789c0.669,0,1.211,0.542,1.211,1.211

c0,0.669-0.542,1.211-1.211,1.211c-0.669,0-1.211-0.542-1.211-1.211C10.789,11.331,11.331,10.789,12,10.789z

M21.789,12

c0,2.256-0.774,4.329-2.061,5.987V6.013C21.015,7.671,21.789,9.744,21.789,12z

M2.211,12c0-2.256,0.774-4.329,2.061-5.987v11.973

C2.985,16.329,2.211,14.256,2.211,12z" />

</vector>

res/xml/dashboard_categories.xml

+1 −20
Original line number Diff line number Diff line
@@ -152,26 +152,7 @@ 
                android:icon="@drawable/ic_settings_buttons"

                />



        <!-- O-Click -->

        <dashboard-tile

                android:id="@+id/oclick"

                android:icon="@drawable/ic_settings_oclick">

            <intent

                    android:action="com.cyanogenmod.action.LAUNCH_BLUETOOTH_INPUT_SETTINGS"

                    android:targetPackage="com.cyanogenmod.settings.device"

                    android:targetClass="com.cyanogenmod.settings.device.BluetoothInputSettings" />

        </dashboard-tile>



        <!-- Gestures -->

        <dashboard-tile

                android:id="@+id/device_specific_gesture_settings"

                android:title="@string/gesture_settings_title"

                android:icon="@drawable/ic_settings_gestures">

            <intent

                    android:action="com.cyanogenmod.action.LAUNCH_TOUCHSCREEN_GESTURE_SETTINGS"

                    android:targetPackage="com.cyanogenmod.settings.device"

                    android:targetClass="com.cyanogenmod.settings.device.TouchscreenGestureSettings" />

        </dashboard-tile>

        <external-tiles />



        <!-- Battery -->

        <dashboard-tile

src/com/android/settings/SettingsActivity.java

+1 −3
Original line number Diff line number Diff line
@@ -1262,9 +1262,7 @@ public class SettingsActivity extends Activity 
                DashboardTile tile = category.getTile(n);

                boolean removeTile = false;

                id = (int) tile.id;

                if (id == R.id.operator_settings || id == R.id.manufacturer_settings

                        || id == R.id.device_specific_gesture_settings

                        || id == R.id.oclick) {

                if (id == R.id.operator_settings || id == R.id.manufacturer_settings) {

                    if (!Utils.updateTileToSpecificActivityFromMetaDataOrRemove(this, tile)) {

                        removeTile = true;

                    }