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

Commit 3b587143 authored by Jason Monk's avatar Jason Monk
Browse files

Add clipboard to tuner 

Allow button to be added to nav bar that acts as a drag target/source
for the clipboard.

Change-Id: I94ca3c7decd1a1b178ceb9a4b4ab9e275c90acbb
parent 46a196e2

packages/SystemUI/res/drawable/clipboard_empty.xml

0 → 100644
+25 −0
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.

-->

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

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M19.0,2.0l-4.18,0.0C14.0,0.84 13.3,0.0 12.0,0.0c-1.3,0.0 -2.0,0.84 -2.82,2.0L5.0,2.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,16.0c0.0,1.0 0.9,2.0 2.0,2.0l14.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L21.0,4.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm-7.0,0.0c0.55,0.0 1.0,0.45 1.0,1.0s-0.45,1.0 -1.0,1.0 -1.0,-0.45 -1.0,-1.0 0.45,-1.0 1.0,-1.0zm7.0,18.0L5.0,20.0L5.0,4.0l2.0,0.0l0.0,3.0l10.0,0.0L17.0,4.0l2.0,0.0l0.0,16.0z" />

</vector>

packages/SystemUI/res/drawable/clipboard_full.xml

0 → 100644
+25 −0
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.

-->

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

    android:width="24.0dp"

    android:height="24.0dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M19.0,2.0l-4.18,0.0C14.0,0.84 13.3,0.0 12.0,0.0c-1.3,0.0 -2.0,0.84 -2.82,2.0L5.0,2.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,16.0c0.0,1.0 0.9,2.0 2.0,2.0l14.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L21.0,4.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm-7.0,0.0c0.55,0.0 1.0,0.45 1.0,1.0s-0.45,1.0 -1.0,1.0 -1.0,-0.45 -1.0,-1.0 0.45,-1.0 1.0,-1.0zm7.0,18.0L5.0,20.0L5.0,4.0l2.0,0.0l0.0,3.0l10.0,0.0L17.0,4.0l2.0,0.0l0.0,16.0z M 6,8 l 12,0 l 0,11 l -12,0 l 0,-11z" />

</vector>

packages/SystemUI/res/layout/clipboard.xml

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

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

-->

<com.android.systemui.tuner.ClipboardView

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

    xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:layout_width="@dimen/navigation_side_padding"

    android:layout_height="match_parent"

    android:layout_weight="0"

    android:scaleType="center"

    android:contentDescription="@string/clipboard"

    />

packages/SystemUI/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -1381,4 +1381,10 @@ 
    <!-- SysUI Tuner: Adjust button width dialog title [CHAR LIMIT=60] -->

    <string name="adjust_button_width">Adjust button width</string>



    <!-- SysUI Tuner: Nav bar button that holds the clipboard [CHAR LIMIT=30] -->

    <string name="clipboard">Clipboard</string>



    <!-- SysUI Tuner: Description of nav bar button that holds the clipboard [CHAR LIMIT=NONE] -->

    <string name="clipboard_description">The Clipboard allows items to be dragged directly to the clipboard. Items can also be dragged directly out of the clipboard when present.</string>



</resources>

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ public class NavigationBarInflaterView extends FrameLayout implements TunerServi 
    public static final String HOME = "home";

    public static final String RECENT = "recent";

    public static final String NAVSPACE = "space";

    public static final String CLIPBOARD = "clipboard";



    public static final String GRAVITY_SEPARATOR = ";";

    public static final String BUTTON_SEPARATOR = ",";
@@ -233,6 +234,8 @@ public class NavigationBarInflaterView extends FrameLayout implements TunerServi 
            v = inflater.inflate(R.layout.menu_ime, parent, false);

        } else if (NAVSPACE.equals(button)) {

            v = inflater.inflate(R.layout.nav_key_space, parent, false);

        } else if (CLIPBOARD.equals(button)) {

            v = inflater.inflate(R.layout.clipboard, parent, false);

        } else {

            return null;

        }