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

Commit 70ae70b8 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Explicitly set the font face and color. 

This matches what the UI folks asked us to use.

Also fix the locale parsing code.

Bug: http://b/27837319
Bug: http://b/22465983
Bug: http://b/26548285
Change-Id: I316a6e1f44855313dd983950abf21b543be7ffc0
parent 8febafa6

tools/recovery_l10n/res/layout/main.xml

+3 −1
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ 
  <TextView android:id="@+id/text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textColor="#ffffffff"

            android:fontFamily="sans-serif-medium"

            android:textColor="#fff5f5f5"

            android:textSize="14sp"

            android:background="#ff000000"

            android:maxWidth="480px"

            android:gravity="center"

tools/recovery_l10n/src/com/android/recovery_l10n/Main.java

+3 −6
Original line number Diff line number Diff line
@@ -149,12 +149,9 @@ public class Main extends Activity { 
        String[] localeNames = getAssets().getLocales();

        Arrays.sort(localeNames);

        ArrayList<Locale> locales = new ArrayList<Locale>();

        for (String ln : localeNames) {

            int u = ln.indexOf('_');

            if (u >= 0) {

                Log.i(TAG, "locale = " + ln);

                locales.add(new Locale(ln.substring(0, u), ln.substring(u+1)));

            }

        for (String localeName : localeNames) {

            Log.i(TAG, "locale = " + localeName);

            locales.add(Locale.forLanguageTag(localeName));

        }



        final Runnable seq = buildSequence(locales.toArray(new Locale[0]));