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

Commit e17806b8 authored by Anna Bauza's avatar Anna Bauza
Browse files

Flag removal: RELEASE_AVATAR_PICKER_APP 

Bug: 409607992
Flag: EXEMPT removing RELEASE_AVATAR_PICKER_APP
Test: N/A
Change-Id: I1b66c835db5264d4cf0fe502d2114844e79a383c
parent 39d4c919

packages/SettingsLib/Android.bp

+0 −30
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ package { 
android_library {

    name: "SettingsLib",

    defaults: [

        "SettingsLibAvatarPickerDefaults",

        "SettingsLintDefaults",

    ],
@@ -114,32 +113,3 @@ java_aconfig_library { 
    name: "settingslib_media_flags_lib",

    aconfig_declarations: "settingslib_media_flags",

}
 


soong_config_module_type {

    name: "avatar_picker_java_defaults",

    module_type: "java_defaults",

    config_namespace: "SettingsLib",

    bool_variables: [

        "legacy_avatar_picker_app_enabled",

    ],

    properties: [

        "manifest",

        "static_libs",

    ],

}



soong_config_bool_variable {

    name: "legacy_avatar_picker_app_enabled",

}



avatar_picker_java_defaults {

    name: "SettingsLibAvatarPickerDefaults",

    soong_config_variables: {

        // If flag is enabled, add the library

        legacy_avatar_picker_app_enabled: {

            static_libs: [

                "SettingsLibAvatarPicker",

            ],

        },

    },

}

packages/SettingsLib/AvatarPicker/Android.bp

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



android_library {

    name: "SettingsLibAvatarPicker",

    manifest: "AndroidManifest.xml",

    use_resource_processor: true,

    platform_apis: true,



    defaults: [

        "SettingsLintDefaults",

    ],



    static_libs: [

        "SettingsLibSettingsTheme",

        "setupdesign",

        "guava",

    ],



    resource_dirs: ["res"],

    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

    ],

}

packages/SettingsLib/AvatarPicker/AndroidManifest.xml

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

<!-- Copyright (C) 2024 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.

-->



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

          package="com.android.settingslib.avatarpicker">



    <uses-sdk android:minSdkVersion="23" />

    <application>

        <activity

            android:name=".AvatarPickerActivity"

            android:theme="@style/SudThemeGlifV2.DayNight"

            android:exported="true">

            <intent-filter>

                <action android:name="com.android.avatarpicker.FULL_SCREEN_ACTIVITY" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>

    </application>

</manifest>

packages/SettingsLib/AvatarPicker/res/drawable/avatar_choose_photo_circled.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2024 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.

  -->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item>

        <shape android:shape="oval">

            <stroke

                android:width="2dp"

                android:color="?android:attr/colorPrimary" />

        </shape>

    </item>

    <item

        android:bottom="@dimen/avatar_picker_icon_inset"

        android:drawable="@drawable/ic_avatar_choose_photo"

        android:left="@dimen/avatar_picker_icon_inset"

        android:right="@dimen/avatar_picker_icon_inset"

        android:top="@dimen/avatar_picker_icon_inset" />

</layer-list>

packages/SettingsLib/AvatarPicker/res/drawable/avatar_selector.xml

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

    Copyright (C) 2024 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.

  -->

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

    <item android:state_selected="true">

        <shape android:shape="oval">

            <stroke android:width="@dimen/avatar_picker_padding" android:color="?android:attr/colorPrimary" />

        </shape>

    </item>

</selector>
 
 No newline at end of file