1355616 - Make Android resources match SDK restrictions

Status: NEW

(Firefox Build System :: Android Studio and Gradle Integration, enhancement)

Description

[Nick Alexander :nalexander [he/him]]

Right now, mobile/android/base/resources contains some resources folders that contain qualifiers (like hdpi, xhdpi, etc) but no versions.  These are accepted, but they have a "secret" version qualifier -- in the case of hdpi, it's v4, since that's the first Android version that discriminated on screen density.  The set of versions is small; I reverse engineered it from [1] and some of the outputs of a Gradle build.

In addition, we have resources that we can statically prove will never be accessed because there's a more recent version that is less than the minimum SDK version we run on.  For example, drawable-v12/toast_button_background.xml will _always_ be preferred to drawable/toast_button_background.xml, since v12 is less than our minimum SDK version v15 (and since drawable-v12 overrides the unqualified drawable).

This ticket tracks adding the version qualifiers, and purging the inaccessible resources.

The motivation for doing so is simple: by adding the qualifiers, we get closer to the set of merged resources that the Gradle build process ends up using.  Future work will converge the set of resources used by moz.build to exactly the same set used by Gradle, making it easier to "flip the switch".  In addition, we save a small amount of APK space by purging the unused resources.

[1] https://android.googlesource.com/platform/tools/base/+/588c433884c745cba0e09eb16a7f269dfee2c1aa/sdk-common/src/main/java/com/android/ide/common/resources/configuration/FolderConfiguration.java

Comment 1

[Nick Alexander :nalexander [he/him]]

Attachment: Bug 1355616 - Move Android resources to match SDK restrictions.

This is the result of running the following bash script:

#!/bin/bash

# The following are always overridden by drawable-{hdpi,xhdpi}-v11.
for x in alert_camera.png alert_download.png alert_guest.png alert_mic.png alert_mic_camera.png ic_status_logo.png ; do
    test -f mobile/android/base/resources/drawable-hdpi-v11/$x && hg rm mobile/android/base/resources/drawable-hdpi/$x
done

# The following are always overridden by xml-v11.
for x in preference_headers.xml preferences_search.xml ; do
    test -f mobile/android/base/resources/xml-v11/$x && hg rm mobile/android/base/resources/xml/$x
done

# The following are always overridden by menu-v11.
for x in preferences_search_menu.xml tabs_menu.xml titlebar_contextmenu.xml ; do
    test -f mobile/android/base/resources/menu-v11/$x && hg rm mobile/android/base/resources/menu/$x
done

# The following are always overridden by drawable-v12.
for x in toast_button_background.xml ; do
    test -f mobile/android/base/resources/drawable-v12/$x && hg rm mobile/android/base/resources/drawable/$x
done

# Screen density and size are 4+.
hg mv mobile/android/base/resources/drawable-hdpi mobile/android/base/resources/drawable-hdpi-v4
hg mv mobile/android/base/resources/drawable-nodpi mobile/android/base/resources/drawable-nodpi-v4
hg mv mobile/android/base/resources/drawable-xhdpi mobile/android/base/resources/drawable-xhdpi-v4
hg mv mobile/android/base/resources/drawable-xxhdpi mobile/android/base/resources/drawable-xxhdpi-v4
hg mv mobile/android/base/resources/drawable-xxxhdpi mobile/android/base/resources/drawable-xxxhdpi-v4
hg mv mobile/android/base/resources/menu-large mobile/android/base/resources/menu-large-v4
hg mv mobile/android/base/resources/menu-xlarge mobile/android/base/resources/menu-xlarge-v4
hg mv mobile/android/base/resources/values-large mobile/android/base/resources/values-large-v4

# Width and smallest width is 13+.
hg mv mobile/android/base/resources/values-sw240dp mobile/android/base/resources/values-sw240dp-v13
hg mv mobile/android/base/resources/values-sw360dp mobile/android/base/resources/values-sw360dp-v13
hg mv mobile/android/base/resources/values-sw400dp mobile/android/base/resources/values-sw400dp-v13
hg mv mobile/android/base/resources/values-w400dp mobile/android/base/resources/values-w400dp-v13

# RTL is 17+.
hg mv mobile/android/base/resources/drawable-ldrtl-hdpi mobile/android/base/resources/drawable-ldrtl-hdpi-v17
hg mv mobile/android/base/resources/drawable-ldrtl-large-hdpi mobile/android/base/resources/drawable-ldrtl-large-hdpi-v17
hg mv mobile/android/base/resources/drawable-ldrtl-large-xhdpi mobile/android/base/resources/drawable-ldrtl-large-xhdpi-v17
hg mv mobile/android/base/resources/drawable-ldrtl-large-xxhdpi mobile/android/base/resources/drawable-ldrtl-large-xxhdpi-v17
hg mv mobile/android/base/resources/drawable-ldrtl-xhdpi mobile/android/base/resources/drawable-ldrtl-xhdpi-v17
hg mv mobile/android/base/resources/drawable-ldrtl-xxhdpi mobile/android/base/resources/drawable-ldrtl-xxhdpi-v17

Review commit: https://reviewboard.mozilla.org/r/129120/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/129120/

Comment 2

[Nick Alexander :nalexander [he/him]]

Attachment: Bug 1355616 - Move Android resources to match SDK restrictions.

This is the result of running the following bash script:

#!/bin/bash

# The following are always overridden by drawable-{hdpi,xhdpi}-v11.
for x in alert_camera.png alert_download.png alert_guest.png alert_mic.png alert_mic_camera.png ic_status_logo.png ; do
    test -f mobile/android/base/resources/drawable-hdpi-v11/$x && hg rm mobile/android/base/resources/drawable-hdpi/$x
done

# The following are always overridden by xml-v11.
for x in preference_headers.xml preferences_search.xml ; do
    test -f mobile/android/base/resources/xml-v11/$x && hg rm mobile/android/base/resources/xml/$x
done

# The following are always overridden by menu-v11.
for x in preferences_search_menu.xml tabs_menu.xml titlebar_contextmenu.xml ; do
    test -f mobile/android/base/resources/menu-v11/$x && hg rm mobile/android/base/resources/menu/$x
done

# The following are always overridden by drawable-v12.
for x in toast_button_background.xml ; do
    test -f mobile/android/base/resources/drawable-v12/$x && hg rm mobile/android/base/resources/drawable/$x
done

# Screen density and size are 4+.
mkdir mobile/android/base/resources/{drawable-hdpi-v4,drawable-nodpi-v4,drawable-xhdpi-v4,drawable-xxhdpi-v4,drawable-xxxhdpi-v4,menu-large-v4,menu-xlarge-v4,values-large-v4}
hg mv mobile/android/base/resources/drawable-hdpi/* mobile/android/base/resources/drawable-hdpi-v4
hg mv mobile/android/base/resources/drawable-nodpi/* mobile/android/base/resources/drawable-nodpi-v4
hg mv mobile/android/base/resources/drawable-xhdpi/* mobile/android/base/resources/drawable-xhdpi-v4
hg mv mobile/android/base/resources/drawable-xxhdpi/* mobile/android/base/resources/drawable-xxhdpi-v4
hg mv mobile/android/base/resources/drawable-xxxhdpi/* mobile/android/base/resources/drawable-xxxhdpi-v4
hg mv mobile/android/base/resources/menu-large/* mobile/android/base/resources/menu-large-v4
hg mv mobile/android/base/resources/menu-xlarge/* mobile/android/base/resources/menu-xlarge-v4
hg mv mobile/android/base/resources/values-large/* mobile/android/base/resources/values-large-v4

# Width and smallest width is 13+.
mkdir mobile/android/base/resources/{values-sw240dp-v13,values-sw360dp-v13,values-sw400dp-v13,values-w400dp-v13}
hg mv mobile/android/base/resources/values-sw240dp/* mobile/android/base/resources/values-sw240dp-v13
hg mv mobile/android/base/resources/values-sw360dp/* mobile/android/base/resources/values-sw360dp-v13
hg mv mobile/android/base/resources/values-sw400dp/* mobile/android/base/resources/values-sw400dp-v13
hg mv mobile/android/base/resources/values-w400dp/* mobile/android/base/resources/values-w400dp-v13

# RTL is 17+.
mkdir mobile/android/base/resources/{drawable-ldrtl-hdpi-v17,drawable-ldrtl-large-hdpi-v17,drawable-ldrtl-large-xhdpi-v17,drawable-ldrtl-large-xxhdpi-v17,drawable-ldrtl-xhdpi-v17,drawable-ldrtl-xxhdpi-v17}
hg mv mobile/android/base/resources/drawable-ldrtl-hdpi/* mobile/android/base/resources/drawable-ldrtl-hdpi-v17
hg mv mobile/android/base/resources/drawable-ldrtl-large-hdpi/* mobile/android/base/resources/drawable-ldrtl-large-hdpi-v17
hg mv mobile/android/base/resources/drawable-ldrtl-large-xhdpi/* mobile/android/base/resources/drawable-ldrtl-large-xhdpi-v17
hg mv mobile/android/base/resources/drawable-ldrtl-large-xxhdpi/* mobile/android/base/resources/drawable-ldrtl-large-xxhdpi-v17
hg mv mobile/android/base/resources/drawable-ldrtl-xhdpi/* mobile/android/base/resources/drawable-ldrtl-xhdpi-v17
hg mv mobile/android/base/resources/drawable-ldrtl-xxhdpi/* mobile/android/base/resources/drawable-ldrtl-xxhdpi-v17

Review commit: https://reviewboard.mozilla.org/r/129152/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/129152/

Comment 3

[Nick Alexander :nalexander [he/him]]

Comment on attachment 8857216 [details]
Bug 1355616 - Move Android resources to match SDK restrictions.

Sorry for the churn -- I found problems with my comparison scripts, so this isn't quite enough just yet.

Comment 4

[Sebastian Kaspari (:sebastian; :pocmo)]

I guess we can fold bug 1261037 into this one?

Comment 5

[Nick Alexander :nalexander [he/him]]

(In reply to Sebastian Kaspari (:sebastian) from comment #4)
> I guess we can fold bug 1261037 into this one?

I commented on that ticket.  I'd like to keep this one just for the build system stuff, and use that one for general purpose clean up.