568700 - Font aliases and defaults for Android

Status: RESOLVED FIXED

(Core Graveyard :: Widget: Android, defect)

Description

[Matt Brubeck (:mbrubeck)]

Attachment: WIP 0.1

This patch sets serif/sans-serif/monospace font aliases that work on the Android platform using the built-in Droid typefaces.

It also sets the default font to sans-serif for Cyrillic, Greek, and Roman-based scripts.  This matches the default on the built-in Android browser.  Droid Sans seems to be much more readable as a text font than Droid Serif.  (For all other scripts I left the defaults the same as on Unix because I don't know enough about them.)

This is a work in progress.  I haven't tested all of the encodings/scripts.  The current patch preserves the existing code structure and duplicates a lot of settings.  If we want, I could rearrange things to reduce the duplication a bit - maybe something like Bug 503138?

Comment 1

[Matt Brubeck (:mbrubeck)]

Attachment: patch

Now uses a #define like the patch from bug 503138, to reduce duplication.

Tested on a variety of encodings, and tested on non-Android to make sure it doesn't change anything.

Comment 2

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

Comment on attachment 450289 [details] [diff] [review]
patch

Ugh, this file is a mess.. can you just clone the UNIX section and do the same thing that happens for other platforms, giving ANDROID its own block?  We're likely going to end up changing other prefs here at some point, so may as well do it now.. the #expand everywhere is pretty ugly anyway, and half of it is already in an #ifdef ANDROID block.

Don't forget to add #ifndef ANDROID to before #ifdef XP_UNIX as well.

Comment 3

[Matt Brubeck (:mbrubeck)]

Attachment: patch v2

Clone the XP_UNIX section as requested in comment 2, and leave the existing XP_UNIX section alone.  Output should be the same as the previous patch, except for two Linux-related dom.ipc.plugins.* lines that are no longer included on Android.

I'm not sure I like the way the #endifs are stacking up now, but Preprocessor.py doesn't let me combine them into one "#if !defined() ..." line.  Another option would be to arrange things like:

#ifdef ANDROID
// ...
#elifdef XP_MACOSX
// ...
#elifdef XP_UNIX
// ...
#endif

...but that's might not be an improvement. (Could make it harder to rearrange code without breaking it accidentally.)

Comment 4

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

Comment on attachment 451075 [details] [diff] [review]
patch v2

Yeah, file's a total mess.. this is better, thanks.

At some point I can see moving all the platform specific stuff into something like all-<platform>.js, but meh.

A third option would be to do, at the start of the file:

#ifndef ANDROID
#ifndef XP_MACOSX
#ifdef XP_UNIX
#define REALLY_XP_UNIX
#endif
#endif
#endif

and then just check for REALLY_XP_UNIX later on.  Would remove some of the duplication.

Also, we should get rid of all the unix/linux-only prefs that are in the Android section, but we can do that as a followup (applications.*, networkmanager thing, print.*, java.*, font.alias-list, ui.panel.default_level_parent, etc.)

Comment 5

[Michael Wu [:mwu]]

http://hg.mozilla.org/mozilla-central/rev/9abd63f5ba10