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

Commit d8059a2a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Show privacy icons in status bar"

parents 1dcaa573 cf1a103d

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ 
        <item><xliff:g id="id">@string/status_bar_hotspot</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_mobile</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_airplane</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_microphone</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_camera</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_battery</xliff:g></item>

    </string-array>
@@ -87,6 +89,8 @@ 
    <string translatable="false" name="status_bar_mobile">mobile</string>

    <string translatable="false" name="status_bar_vpn">vpn</string>

    <string translatable="false" name="status_bar_ethernet">ethernet</string>

    <string translatable="false" name="status_bar_microphone">microphone</string>

    <string translatable="false" name="status_bar_camera">camera</string>

    <string translatable="false" name="status_bar_airplane">airplane</string>



    <!-- Flag indicating whether the surface flinger has limited

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -2808,6 +2808,8 @@ 
  <java-symbol type="string" name="status_bar_mobile" />

  <java-symbol type="string" name="status_bar_ethernet" />

  <java-symbol type="string" name="status_bar_vpn" />

  <java-symbol type="string" name="status_bar_microphone" />

  <java-symbol type="string" name="status_bar_camera" />



  <!-- Locale picker -->

  <java-symbol type="id" name="locale_search_menu" />

packages/SystemUI/res/drawable/stat_sys_camera.xml

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

<!--

**

** Copyright 2018, 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.

*/

-->

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

    android:insetLeft="3dp"

    android:insetRight="3dp">

    <vector

            android:width="17dp"

            android:height="17dp"

            android:viewportWidth="24.0"

            android:viewportHeight="24.0">

        <path

            android:fillColor="#FFF"

            android:pathData="M20,5h-3.17L15,3H9L7.17,5H4C2.9,5 2,5.9 2,7v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V7C22,5.9 21.1,5 20,5zM20,19H4V7h16V19zM12,9c-2.21,0 -4,1.79 -4,4c0,2.21 1.79,4 4,4s4,-1.79 4,-4C16,10.79 14.21,9 12,9z"/>

    </vector>

</inset>

packages/SystemUI/res/drawable/stat_sys_mic_none.xml

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

<!--

**

** Copyright 2018, 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="18dp"

    android:height="18dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

    <path

        android:fillColor="#FFF"

        android:pathData="M12,14c1.66,0 3,-1.34 3,-3V5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6C9,12.66 10.34,14 12,14zM11,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v6c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1V5z"/>

    <path

        android:fillColor="#FFF"

        android:pathData="M17,11c0,2.76 -2.24,5 -5,5s-5,-2.24 -5,-5H5c0,3.53 2.61,6.43 6,6.92V21h2v-3.08c3.39,-0.49 6,-3.39 6,-6.92H17z"/>

</vector>

packages/SystemUI/src/com/android/systemui/privacy/PrivacyItem.kt

+2 −2
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ import com.android.systemui.R 
typealias Privacy = PrivacyType



enum class PrivacyType(val nameId: Int, val iconId: Int) {

    TYPE_CAMERA(R.string.privacy_type_camera, com.android.internal.R.drawable.ic_camera),

    TYPE_CAMERA(R.string.privacy_type_camera, R.drawable.stat_sys_camera),

    TYPE_LOCATION(R.string.privacy_type_location, R.drawable.stat_sys_location),

    TYPE_MICROPHONE(R.string.privacy_type_microphone, R.drawable.ic_mic_26dp);

    TYPE_MICROPHONE(R.string.privacy_type_microphone, R.drawable.stat_sys_mic_none);



    fun getName(context: Context) = context.resources.getString(nameId)