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

Commit a7aeb86e authored by Yiyi Shen's avatar Yiyi Shen Committed by Android (Google) Code Review
Browse files

Merge "Add flag for Subsequent pair Settings integration" into main

parents 84c4ec93 14c611a3

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ android_library { 
        "Settings-change-ids",

        "androidx.room_room-runtime",

        "SystemUIUnfoldLib",

        "aconfig_settings_flags_lib",

    ],



    plugins: [

aconfig/Android.bp

0 → 100644
+17 −0
Original line number Diff line number Diff line 
package {

    default_applicable_licenses: ["packages_apps_Settings_license"],

}



aconfig_declarations {

    name: "aconfig_settings_connecteddevice_flags",

    package: "com.android.settings.connecteddevice.flags",

    srcs: [

        "settings_connecteddevice_flag_declarations.aconfig",

    ],

}



java_aconfig_library {

    name: "aconfig_settings_flags_lib",

    aconfig_declarations: "aconfig_settings_connecteddevice_flags",

}

aconfig/settings_connecteddevice_flag_declarations.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "com.android.settings.connecteddevice.flags"



flag {

  name: "enable_subsequent_pair_settings_integration"

  namespace: "pixel_cross_device_control"

  description: "Gates whether to enable subsequent pair Settings integration."

  bug: "296507968"

}