Move new resources into flagged subdirectory r.android.com/1909373 added several new resources and strings. All of the code that referred to them was flag-guarded, but the resources themselves weren't. Since these aren't needed at all when the flag is diabled, move all the new resources into a flag-guarded subdirectory. Bug: 374764554 Test: m BuiltInPrintService Flag: com.android.bips.flags.printer_info_details Change-Id: I1879b59ab4d8a78b77a3b1d287d6660f26c452b6
diff --git a/res/drawable/ic_info.xml "b/res/flag\050com.android.bips.flags.printer_info_details\051/drawable/ic_info.xml" similarity index 100% rename from res/drawable/ic_info.xml rename to "res/flag\050com.android.bips.flags.printer_info_details\051/drawable/ic_info.xml"
diff --git a/res/drawable/ic_supply_marker_warning.xml "b/res/flag\050com.android.bips.flags.printer_info_details\051/drawable/ic_supply_marker_warning.xml" similarity index 100% rename from res/drawable/ic_supply_marker_warning.xml rename to "res/flag\050com.android.bips.flags.printer_info_details\051/drawable/ic_supply_marker_warning.xml"
diff --git a/res/drawable/supply_marker_shape.xml "b/res/flag\050com.android.bips.flags.printer_info_details\051/drawable/supply_marker_shape.xml" similarity index 100% rename from res/drawable/supply_marker_shape.xml rename to "res/flag\050com.android.bips.flags.printer_info_details\051/drawable/supply_marker_shape.xml"
diff --git a/res/layout/combined_info_recs.xml "b/res/flag\050com.android.bips.flags.printer_info_details\051/layout/combined_info_recs.xml" similarity index 100% rename from res/layout/combined_info_recs.xml rename to "res/flag\050com.android.bips.flags.printer_info_details\051/layout/combined_info_recs.xml"
diff --git a/res/layout/item_marker_type.xml "b/res/flag\050com.android.bips.flags.printer_info_details\051/layout/item_marker_type.xml" similarity index 100% rename from res/layout/item_marker_type.xml rename to "res/flag\050com.android.bips.flags.printer_info_details\051/layout/item_marker_type.xml"
diff --git a/res/layout/printer_information.xml "b/res/flag\050com.android.bips.flags.printer_info_details\051/layout/printer_information.xml" similarity index 100% rename from res/layout/printer_information.xml rename to "res/flag\050com.android.bips.flags.printer_info_details\051/layout/printer_information.xml"
diff --git a/res/values/dimens.xml "b/res/flag\050com.android.bips.flags.printer_info_details\051/values/dimens.xml" similarity index 100% rename from res/values/dimens.xml rename to "res/flag\050com.android.bips.flags.printer_info_details\051/values/dimens.xml"
diff --git "a/res/flag\050com.android.bips.flags.printer_info_details\051/values/strings.xml" "b/res/flag\050com.android.bips.flags.printer_info_details\051/values/strings.xml" new file mode 100644 index 0000000..afb905f --- /dev/null +++ "b/res/flag\050com.android.bips.flags.printer_info_details\051/values/strings.xml"
@@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2025 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. +--> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + + <!-- Explain purpose of recommendation fragment [CHAR LIMIT=UNLIMITED] --> + <string name="recommendation_summary_new">The default print service provides basic options. For advanced options additional print services are available.</string> + <!-- Heading for link to services that are not currently installed, but recommended [CHAR LIMIT=UNLIMITED] --> + <string name="recommendation_link">Additional print services</string> + + <!-- Printer Information Screen Strings --> + <string name="yes">Yes</string> + <string name="unknown">Unknown</string> + <string name="printer_name">Printer name</string> + <string name="status">Status</string> + <string name="media_ready">Loaded paper sizes</string> + <string name="supply_levels">Supply levels</string> + <string name="information">Information</string> + <string name="printer_ready">Ready</string> + <!-- Printer status messages--> + <string name="printer_state__printing">Printing</string> + <string name="printer_state__offline">Offline</string> + <string name="printer_state__check_printer">Check printer</string> + +</resources>
diff --git a/res/xml/more_options_prefs_new.xml "b/res/flag\050com.android.bips.flags.printer_info_details\051/xml/more_options_prefs_new.xml" similarity index 100% rename from res/xml/more_options_prefs_new.xml rename to "res/flag\050com.android.bips.flags.printer_info_details\051/xml/more_options_prefs_new.xml"
diff --git a/res/values/strings.xml b/res/values/strings.xml index 5efab58..75bd1b0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml
@@ -88,11 +88,8 @@ <!-- Explain purpose of recommendation fragment [CHAR LIMIT=UNLIMITED] --> <string name="recommendation_summary">The Default Print Service provides basic options. Other options for this printer may be available from another print service.</string> - <string name="recommendation_summary_new" android:featureFlag="com.android.bips.flags.printer_info_details">The default print service provides basic options. For advanced options additional print services are available.</string> <!-- Heading for services that are not currently installed, but recommended [CHAR LIMIT=UNLIMITED] --> <string name="recommendations_heading">Recommended Services</string> - <!-- Heading for link to services that are not currently installed, but recommended [CHAR LIMIT=UNLIMITED] --> - <string name="recommendation_link" android:featureFlag="com.android.bips.flags.printer_info_details">Additional print services</string> <!-- Summary for recommended services that are not installed [CHAR LIMIT=UNLIMITED] --> <string name="recommendation_install_summary">Select to install</string> <!-- Summary for recommended services that are installed [CHAR LIMIT=UNLIMITED] --> @@ -126,18 +123,4 @@ <!-- Share-to-print label [CHAR LIMIT=20] --> <string name="print">Print</string> - <!-- Printer Information Screen Strings --> - <string name="yes" android:featureFlag="com.android.bips.flags.printer_info_details">Yes</string> - <string name="unknown" android:featureFlag="com.android.bips.flags.printer_info_details">Unknown</string> - <string name="printer_name" android:featureFlag="com.android.bips.flags.printer_info_details">Printer name</string> - <string name="status" android:featureFlag="com.android.bips.flags.printer_info_details">Status</string> - <string name="media_ready" android:featureFlag="com.android.bips.flags.printer_info_details">Loaded paper sizes</string> - <string name="supply_levels" android:featureFlag="com.android.bips.flags.printer_info_details">Supply levels</string> - <string name="information" android:featureFlag="com.android.bips.flags.printer_info_details">Information</string> - <string name="printer_ready" android:featureFlag="com.android.bips.flags.printer_info_details">Ready</string> - <!-- Printer status messages--> - <string name="printer_state__printing" android:featureFlag="com.android.bips.flags.printer_info_details">Printing</string> - <string name="printer_state__offline" android:featureFlag="com.android.bips.flags.printer_info_details">Offline</string> - <string name="printer_state__check_printer" android:featureFlag="com.android.bips.flags.printer_info_details">Check printer</string> - </resources>