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

Commit 2c06a156 authored by Anna Bauza's avatar Anna Bauza
Browse files

Complete: Create badge for USER_TYPE_PROFILE_TEST 

Adding new badges for test user type profile.
Icon preview:
![experiment badge](https://fonts.gstatic.com/s/i/short-term/release/googlesymbols/experiment/default/48px.svg)

Bug: 231995504
Test: manual
Change-Id: I0fdd5172a540bad1b07018ea8e972e1efec6ee09
parent d37280b4

core/res/res/drawable/ic_test_badge_experiment.xml

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

<!--

Copyright (C) 2022 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="20dp"

        android:height="20dp"

        android:viewportWidth="20"

        android:viewportHeight="20">

    <path android:fillColor="@android:color/white"

          android:pathData="M4.271,17.5Q3.167,17.5 2.688,16.51Q2.208,15.521 2.896,14.667L7.438,9.146V4.25H6.688Q6.312,4.25 6.062,4Q5.812,3.75 5.812,3.375Q5.812,3 6.062,2.75Q6.312,2.5 6.688,2.5H13.312Q13.688,2.5 13.938,2.75Q14.188,3 14.188,3.375Q14.188,3.75 13.938,4Q13.688,4.25 13.312,4.25H12.562V9.146L17.104,14.667Q17.792,15.521 17.312,16.51Q16.833,17.5 15.729,17.5ZM6.104,14.875H13.896L11.229,11.646H8.771ZM4.271,15.75H15.729L10.812,9.75V4.25H9.188V9.75ZM10,10Z"/>

</vector>
 
 No newline at end of file

core/res/res/drawable/ic_test_badge_no_background.xml

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

<!--

Copyright (C) 2022 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:fillColor="@android:color/white"

          android:pathData="M5,21Q3.725,21 3.188,19.863Q2.65,18.725 3.45,17.75L9,11V5H8Q7.575,5 7.287,4.712Q7,4.425 7,4Q7,3.575 7.287,3.287Q7.575,3 8,3H16Q16.425,3 16.712,3.287Q17,3.575 17,4Q17,4.425 16.712,4.712Q16.425,5 16,5H15V11L20.55,17.75Q21.35,18.725 20.812,19.863Q20.275,21 19,21ZM7,18H17L13.6,14H10.4ZM5,19H19L13,11.7V5H11V11.7ZM12,12Z"/>

</vector>
 
 No newline at end of file

core/res/res/drawable/ic_test_icon_badge_experiment.xml

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

<!--

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

    <path android:fillColor="@android:color/white"

          android:pathData="M8.6,42Q6.55,42 5.8,39.9Q5.05,37.8 6.2,36.5L18.6,22.5V9H16Q15.4,9 14.95,8.55Q14.5,8.1 14.5,7.5Q14.5,6.9 14.95,6.45Q15.4,6 16,6H32Q32.6,6 33.05,6.45Q33.5,6.9 33.5,7.5Q33.5,8.1 33.05,8.55Q32.6,9 32,9H29.4V22.5L41.8,36.5Q43,37.85 42.225,39.925Q41.45,42 39.4,42ZM12.1,37.5H35.9L27.9,28.25H20.1ZM8,39H40L26.4,23.6V9H21.6V23.6ZM24,24Z"/>

</vector>
 
 No newline at end of file

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -1421,6 +1421,9 @@ 
  <java-symbol type="drawable" name="ic_corp_user_badge" />

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

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

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

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

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

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

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

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

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

+3 −3
Original line number Diff line number Diff line
@@ -170,9 +170,9 @@ public final class UserTypeFactory { 
                .setBaseType(FLAG_PROFILE)

                .setMaxAllowedPerParent(2)

                .setLabel(0)

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

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

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

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

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

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

                .setBadgeLabels(

                        com.android.internal.R.string.managed_profile_label_badge,

                        com.android.internal.R.string.managed_profile_label_badge_2,