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

Commit 6fb5c14c authored by Himanshu Gupta's avatar Himanshu Gupta
Browse files

Adding Badge(s) for Clone Profile 

Test: Manual by triggering sharesheet, notifications.
Change-Id: Ia40d2a29ba6a00fd3b7c2cc1c4b30e0f0e23561b
parent fd3a44f5

core/res/res/drawable/ic_clone_badge.xml

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

  ~ Copyright (C) 2023 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="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

    <path

        android:pathData="M22,9.5C22,13.642 18.642,17 14.5,17C10.358,17 7,13.642 7,9.5C7,5.358 10.358,2 14.5,2C18.642,2 22,5.358 22,9.5Z"

        android:fillColor="@android:color/system_neutral2_800"/>

    <path

        android:pathData="M9.5,20.333C12.722,20.333 15.333,17.722 15.333,14.5C15.333,11.278 12.722,8.667 9.5,8.667C6.278,8.667 3.667,11.278 3.667,14.5C3.667,17.722 6.278,20.333 9.5,20.333ZM9.5,22C13.642,22 17,18.642 17,14.5C17,10.358 13.642,7 9.5,7C5.358,7 2,10.358 2,14.5C2,18.642 5.358,22 9.5,22Z"

        android:fillColor="@android:color/system_neutral2_800"

        android:fillType="evenOdd"/>

</vector>
 
 No newline at end of file

core/res/res/drawable/ic_clone_icon_badge.xml

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

  ~ Copyright (C) 2023 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="64dp"

        android:height="64dp"

        android:viewportWidth="64"

        android:viewportHeight="64">

<group

    android:scaleX=".66"

    android:scaleY=".66"

    android:translateX="42"

    android:translateY="42">

    <path

        android:pathData="M22,9.5C22,13.642 18.642,17 14.5,17C10.358,17 7,13.642 7,9.5C7,5.358 10.358,2 14.5,2C18.642,2 22,5.358 22,9.5Z"

        android:fillColor="@android:color/system_neutral2_800"/>

    <path

        android:pathData="M9.5,20.333C12.722,20.333 15.333,17.722 15.333,14.5C15.333,11.278 12.722,8.667 9.5,8.667C6.278,8.667 3.667,11.278 3.667,14.5C3.667,17.722 6.278,20.333 9.5,20.333ZM9.5,22C13.642,22 17,18.642 17,14.5C17,10.358 13.642,7 9.5,7C5.358,7 2,10.358 2,14.5C2,18.642 5.358,22 9.5,22Z"

        android:fillColor="@android:color/system_neutral2_800"

        android:fillType="evenOdd"/>

</group>

</vector>

core/res/res/values/strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -5049,6 +5049,13 @@ 
    <string name="managed_profile_label_badge_2">2nd Work <xliff:g id="label" example="Email">%1$s</xliff:g></string>

    <string name="managed_profile_label_badge_3">3rd Work <xliff:g id="label" example="Email">%1$s</xliff:g></string>



    <!--

        Used to wrap a label for content description for a Clone profile, e.g. "Clone Messenger"

        instead of Messenger when the Messenger app is cloned.

        [CHAR LIMIT=20]

    -->

    <string name="clone_profile_label_badge">Clone <xliff:g id="label" example="Messenger">%1$s</xliff:g></string>



    <!-- DO NOT TRANSLATE -->

    <string name="time_placeholder">--</string>

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -1061,6 +1061,7 @@ 
  <java-symbol type="string" name="managed_profile_label_badge" />

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

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

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

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

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

  <java-symbol type="string" name="mediasize_iso_a0" />
@@ -1384,6 +1385,8 @@ 
  <java-symbol type="drawable" name="ic_qs_auto_rotate" />

  <java-symbol type="drawable" name="ic_qs_dnd" />

  <java-symbol type="drawable" name="ic_qs_one_handed_mode" />

  <java-symbol type="drawable" name="ic_clone_icon_badge" />

  <java-symbol type="drawable" name="ic_clone_badge" />



  <java-symbol type="drawable" name="sim_light_blue" />

  <java-symbol type="drawable" name="sim_light_green" />

services/core/java/com/android/server/pm/UserTypeFactory.java

+10 −0
Original line number Diff line number Diff line
@@ -121,6 +121,16 @@ public final class UserTypeFactory { 
                .setBaseType(FLAG_PROFILE)

                .setMaxAllowedPerParent(1)

                .setLabel(0)

                .setIconBadge(com.android.internal.R.drawable.ic_clone_icon_badge)

                .setBadgePlain(com.android.internal.R.drawable.ic_clone_badge)

                // Clone doesn't use BadgeNoBackground, so just set to BadgePlain as a placeholder.

                .setBadgeNoBackground(com.android.internal.R.drawable.ic_clone_badge)

                .setBadgeLabels(

                        com.android.internal.R.string.clone_profile_label_badge)

                .setBadgeColors(

                        com.android.internal.R.color.system_neutral2_800)

                .setDarkThemeBadgeColors(

                        com.android.internal.R.color.system_neutral2_900)

                .setDefaultRestrictions(null)

                .setIsMediaSharedWithParent(true)

                .setIsCredentialSharableWithParent(true)