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

Commit 46b8c756 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Add flashlight to quick settings"

parents 1c7c319b b83777ba

packages/SystemUI/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -106,6 +106,8 @@ 
    <!-- Wifi Display -->

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



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



    <application

        android:name=".SystemUIApplication"

        android:persistent="true"

packages/SystemUI/res/drawable/ic_qs_flashlight_off.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2014 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" >

    <size

        android:width="64.0dp"

        android:height="64.0dp"/>



    <viewport

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"/>



    <path

        android:fill="#4DFFFFFF"

        android:pathData="M3.3,3.0L2.0,4.3l5.0,5.0L7.0,13.0l3.0,0.0l0.0,9.0l3.6,-6.1l4.1,4.1l1.3,-1.3L3.3,3.0zM17.0,10.0l-4.0,0.0l4.0,-8.0L7.0,2.0l0.0,2.2l8.5,8.5L17.0,10.0z"/>

</vector>

packages/SystemUI/res/drawable/ic_qs_flashlight_on.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2014 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" >

    <size

        android:width="64.0dp"

        android:height="64.0dp"/>



    <viewport

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"/>



    <path

        android:fill="#FFFFFFFF"

        android:pathData="M7.0,2.0l0.0,11.0 3.0,0.0 0.0,9.0 7.0,-12.0 -4.0,0.0 4.0,-8.0z"/>

</vector>

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -540,6 +540,8 @@ 
    <string name="quick_settings_hotspot_label">Hotspot</string>

    <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->

    <string name="quick_settings_notifications_label">Notifications</string>

    <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->

    <string name="quick_settings_flashlight_label">Flashlight</string>



    <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->

    <string name="recents_empty_message">No recent apps</string>

packages/SystemUI/src/com/android/systemui/qs/QSTile.java

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.systemui.R; 
import com.android.systemui.qs.QSTile.State;

import com.android.systemui.statusbar.policy.BluetoothController;

import com.android.systemui.statusbar.policy.CastController;

import com.android.systemui.statusbar.policy.FlashlightController;

import com.android.systemui.statusbar.policy.Listenable;

import com.android.systemui.statusbar.policy.LocationController;

import com.android.systemui.statusbar.policy.NetworkController;
@@ -221,6 +222,7 @@ public abstract class QSTile<TState extends State> implements Listenable { 
        TetheringController getTetheringController();

        CastController getCastController();

        VolumeComponent getVolumeComponent();

        FlashlightController getFlashlightController();

    }



    public static class State {