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

Commit fea19cf4 authored by Xiaowen Lei's avatar Xiaowen Lei
Browse files

Fix sysui-studio build broken by ag/21408305. 

This CL fixes the following sysui-studio build error:
```
Execution failed for task ':SystemUILib:packageDebugResources'.
> /usr/local/google/home/xilei/android_platform/tm-qpr-dev/frameworks/base/packages/SystemUI/res/values/strings.xml: Error: Found item String/security_settings_sfps_enroll_find_sensor_message more than one time
```

Looks like these need to be in res-product/ instead of res/, in order
for the filtering script to work. Filtering script:
  studio-dev/SysUIGradleProject/buildSrc/src/main/groovy/FilterResourcesTask.groovy

Bug: 236188940
Bug: 267407905
Test: build in sysui-studio.
Test: build with `m`
Change-Id: Ia940c0d6f68ddd793aa7d27ea33f33fffcabce47
parent e58ae094

packages/SystemUI/res-product/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -122,6 +122,12 @@ 
       Try again in <xliff:g id="number">%3$d</xliff:g> seconds.

    </string>



    <!-- Content description of the fingerprint icon when the system-provided fingerprint dialog is showing, to locate the sensor (tablet) for accessibility (not shown on the screen). [CHAR LIMIT=NONE]-->

    <string name="security_settings_sfps_enroll_find_sensor_message" product="tablet">The fingerprint sensor is on the power button. It’s the flat button next to the raised volume button on the edge of the tablet.\n\nPressing the power button turns off the screen.</string>

    <!-- Content description of the fingerprint icon when the system-provided fingerprint dialog is showing, to locate the sensor (device) for accessibility (not shown on the screen). [CHAR LIMIT=NONE]-->

    <string name="security_settings_sfps_enroll_find_sensor_message" product="device">The fingerprint sensor is on the power button. It’s the flat button next to the raised volume button on the edge of the device.\n\nPressing the power button turns off the screen.</string>

    <!-- Content description of the fingerprint icon when the system-provided fingerprint dialog is showing, to locate the sensor (default) for accessibility (not shown on the screen). [CHAR LIMIT=NONE]-->

    <string name="security_settings_sfps_enroll_find_sensor_message" product="default">The fingerprint sensor is on the power button. It’s the flat button next to the raised volume button on the edge of the phone.\n\nPressing the power button turns off the screen.</string>



    <!-- Text shown when viewing global actions while phone is locked and additional controls are hidden [CHAR LIMIT=NONE] -->

    <string name="global_action_lock_message" product="default">Unlock your phone for more options</string>
@@ -134,4 +140,7 @@ 
    <string name="media_transfer_playing_this_device" product="default">Playing on this phone</string>

    <!-- Text informing the user that their media is now playing on this tablet device. [CHAR LIMIT=50] -->

    <string name="media_transfer_playing_this_device" product="tablet">Playing on this tablet</string>







</resources>

packages/SystemUI/res/values/strings.xml

+0 −6
Original line number Diff line number Diff line
@@ -405,12 +405,6 @@ 


    <!-- Message shown when the system-provided fingerprint dialog is shown, asking for authentication -->

    <string name="fingerprint_dialog_touch_sensor">Touch the fingerprint sensor</string>

    <!-- Content description of the fingerprint icon when the system-provided fingerprint dialog is showing, to locate the sensor (tablet) for accessibility (not shown on the screen). [CHAR LIMIT=NONE]-->

    <string name="security_settings_sfps_enroll_find_sensor_message" product="tablet">The fingerprint sensor is on the power button. It’s the flat button next to the raised volume button on the edge of the tablet.\n\nPressing the power button turns off the screen.</string>

    <!-- Content description of the fingerprint icon when the system-provided fingerprint dialog is showing, to locate the sensor (device) for accessibility (not shown on the screen). [CHAR LIMIT=NONE]-->

    <string name="security_settings_sfps_enroll_find_sensor_message" product="device">The fingerprint sensor is on the power button. It’s the flat button next to the raised volume button on the edge of the device.\n\nPressing the power button turns off the screen.</string>

    <!-- Content description of the fingerprint icon when the system-provided fingerprint dialog is showing, to locate the sensor (default) for accessibility (not shown on the screen). [CHAR LIMIT=NONE]-->

    <string name="security_settings_sfps_enroll_find_sensor_message" product="default">The fingerprint sensor is on the power button. It’s the flat button next to the raised volume button on the edge of the phone.\n\nPressing the power button turns off the screen.</string>

    <!-- Message shown to inform the user a face cannot be recognized and fingerprint should instead be used.[CHAR LIMIT=50] -->

    <string name="fingerprint_dialog_use_fingerprint_instead">Can\u2019t recognize face. Use fingerprint instead.</string>

    <!-- Message shown to inform the user a face cannot be recognized and fingerprint should instead be used.[CHAR LIMIT=50] -->