Improve appearance of the Android preferences screen

* .gitignore: Add org/gnu/emacs/R.java.
* cross/Makefile.in (top_builddir): Include verbose.mk.  Rewrite
rules to print nice looking statements.
* doc/emacs/android.texi (Android, Android Startup)
(Android Environment, Android Windowing, Android Fonts):
* doc/emacs/emacs.texi (Top): Add an extra ``Android
Troubleshooting'' node and move troubleshooting details there.
* java/Makefile.in: Generate R.java; improve appearance by using
verbose.mk.

* java/org/gnu/emacs/EmacsPreferencesActivity.java: Reimplement
in terms of PreferencesActivity.
* java/org/gnu/emacs/EmacsView.java (handleDirtyBitmap): Avoid
flicker.
* java/res/xml/preferences.xml: New file.
* src/verbose.mk.in (AM_V_AAPT, AM_V_SILENT): New variables.

1 files changed, 40 insertions, 21 deletions

diff --git a/cross/Makefile.in b/cross/Makefile.in
index a44550c6563..fc047fd57bd 100644
--- a/cross/Makefile.in
+++ b/cross/Makefile.in
@@ -20,6 +20,8 @@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 
+-include $(top_builddir)/src/verbose.mk
+
 # Cross-compiling Emacs for Android.
 
 # The cross compiled binaries are built by having ``variant''
@@ -63,11 +65,11 @@ all: lib/libgnu.a src/libemacs.so src/android-emacs $(LIBSRC_BINARIES)
 # This file is used to tell lib/gnulib.mk when
 # $(top_srcdir)/config.status changes.
 config.status: $(top_srcdir)/config.status
-	touch config.status
+	$(AM_V_GEN) touch config.status
 
 src/verbose.mk: verbose.mk.android
-	mkdir -p src
-	cp -f verbose.mk.android src/verbose.mk
+	$(AM_V_GEN) mkdir -p src
+	$(AM_V_SILENT) cp -f verbose.mk.android src/verbose.mk
 
 # Gnulib, make-fingerprint and make-docfile must be built before
 # entering any of the rules below, or they will get the Android
@@ -75,30 +77,35 @@ src/verbose.mk: verbose.mk.android
 
 .PHONY: $(top_builddir)/lib/libgnu.a
 $(top_builddir)/lib/libgnu.a:
-	+ make -C $(top_builddir)/lib libgnu.a
+	$(MAKE) -C $(top_builddir)/lib libgnu.a
 
 .PHONY: $(top_builddir)/lib-src/make-fingerprint
 $(top_builddir)/lib-src/make-fingerprint:
-	make -C $(top_builddir)/lib-src make-fingerprint
+	$(MAKE) -C $(top_builddir)/lib-src make-fingerprint
 
 .PHONY: $(top_builddir)/lib-src/make-docfile
 $(top_builddir)/lib-src/make-docfile:
-	make -C $(top_builddir)/lib-src make-docfile
+	$(MAKE) -C $(top_builddir)/lib-src make-docfile
 
 PRE_BUILD_DEPS=$(top_builddir)/lib/libgnu.a		\
 	       $(top_builddir)/lib-src/make-fingerprint	\
 	       $(top_builddir)/lib-src/make-docfile
 
 lib/config.h: $(top_builddir)/src/config.h.android
-	cp -f -p $(top_builddir)/src/config.h.android lib/config.h
+	$(AM_V_GEN) cp -f -p $(top_builddir)/src/config.h.android \
+	  lib/config.h
 
 lib/gnulib.mk: $(top_builddir)/lib/gnulib.mk.android
-	cp -f -p $(top_builddir)/lib/gnulib.mk.android lib/gnulib.mk
+	$(AM_V_GEN) cp -f -p $(top_builddir)/lib/gnulib.mk.android \
+	  lib/gnulib.mk
+	$(AM_V_SILENT) \
 	sed -i 's/srcdir =.*$$/srcdir = $(subst /,\/,$(LIB_SRCDIR))/g' \
 	  lib/gnulib.mk
 
 lib/Makefile: $(top_builddir)/lib/Makefile.android
-	cp -f -p $(top_builddir)/lib/Makefile.android lib/Makefile
+	$(AM_V_GEN) cp -f -p $(top_builddir)/lib/Makefile.android \
+	  lib/Makefile
+	$(AM_V_SILENT) \
 	sed -i 's/top_srcdir =.*$$/top_srcdir = $(subst /,\/,$(LIB_TOP_SRCDIR))/g' \
 	  lib/Makefile
 
@@ -108,53 +115,65 @@ LIB_DEPS = lib/config.h lib/gnulib.mk lib/Makefile
 .PHONY: lib/libgnu.a
 lib/libgnu.a: src/verbose.mk config.status $(LIB_DEPS) $(PRE_BUILD_DEPS)
 	mkdir -p lib/deps lib/deps/malloc
-	+make -C lib libgnu.a
+	$(MAKE) -C lib libgnu.a
 
 src/Makefile src/config.h &: $(top_builddir)/src/config.h.android	\
   $(top_builddir)/src/Makefile.android
-	mkdir -p src src/deps
+	$(AM_V_GEN)
+	$(AM_V_SILENT) mkdir -p src src/deps
 # Copy config.h to src/
+	$(AM_V_SILENT) \
 	cp -f -p $(top_builddir)/src/config.h.android src/config.h
 # And the Makefile.
+	$(AM_V_SILENT) \
 	cp -f -p $(top_builddir)/src/Makefile.android src/Makefile
 # Next, edit srcdir and top_srcdir to the right location.
+	$(AM_V_SILENT) \
 	sed -i 's/srcdir =.*$$/srcdir = $(subst /,\/,$(SRC_SRCDIR))/g' src/Makefile
+	$(AM_V_SILENT) \
 	sed -i 's/top_srcdir =.*$$/top_srcdir = $(subst /,\/,$(LIB_TOP_SRCDIR))/g' \
 	  src/Makefile
 # Edit references to ../admin/unidata to read ../../admin/unidata.
+	$(AM_V_SILENT) \
 	sed -i 's/\.\.\/admin\/unidata/..\/..\/admin\/unidata/g' src/Makefile
+	$(AM_V_SILENT) \
 	sed -i 's/\.\.\/admin\/charsets/..\/..\/admin\/charsets/g' src/Makefile
 # Next, edit libsrc to the location at top_srcdir! It is important
 # that src/Makefile uses the binaries there, instead of any
 # cross-compiled binaries at ./lib-src.
+	$(AM_V_SILENT) \
 	sed -i 's/libsrc =.*$$/libsrc = \.\.\/\.\.\/lib-src/g' src/Makefile
 # Edit out anything saying -I($(top_srcdir)/lib); that should be
 # covered by -I$(lib)
+	$(AM_V_SILENT) \
 	sed -i 's/-I\$$(top_srcdir)\/lib//g' src/Makefile
 
 .PHONY: src/android-emacs src/libemacs.so
 src/android-emacs src/libemacs.so &: src/Makefile src/config.h \
   src/verbose.mk lib/libgnu.a $(PRE_BUILD_DEPS)
-	+make -C src android-emacs libemacs.so
+	$(MAKE) -C src android-emacs libemacs.so
 
 lib-src/Makefile: $(top_builddir)/lib-src/Makefile.android
-	mkdir -p lib-src
-	cp -f -p $< $@
-	sed -i 's/-I\$${srcdir}\/\.\.\/lib//g' lib-src/Makefile
-
-.PHONY: $(LIBSRC_BINARIES)
-$(LIBSRC_BINARIES) &: src/verbose.mk $(top_builddir)/$@ lib/libgnu.a	\
-  src/config.h lib-src/Makefile $(PRE_BUILD_DEPS)
-	mkdir -p src lib-src
+	$(AM_V_GEN) mkdir -p src lib-src
+	$(AM_V_SILENT) mkdir -p lib-src
+	$(AM_V_SILENT) cp -f -p $< $@
+	$(AM_V_SILENT) sed -i 's/-I\$${srcdir}\/\.\.\/lib//g' lib-src/Makefile
 # Next, edit srcdir and top_srcdir to the right location.
+	$(AM_V_SILENT) \
 	sed -i 's/srcdir=.*$$/srcdir = $(subst /,\/,$(LIB_SRC_SRCDIR))/g' \
 	  lib-src/Makefile
+	$(AM_V_SILENT) \
 	sed -i 's/top_srcdir=.*$$/top_srcdir = $(subst /,\/,$(LIB_SRC_TOP_SRCDIR))/g' \
 	  lib-src/Makefile
 # Edit out SCRIPTS, it interferes with the build.
+	$(AM_V_SILENT) \
 	sed -i 's/^SCRIPTS=.*$$/SCRIPTS=/g' lib-src/Makefile
+
+.PHONY: $(LIBSRC_BINARIES)
+$(LIBSRC_BINARIES) &: src/verbose.mk $(top_builddir)/$@ lib/libgnu.a	\
+  src/config.h lib-src/Makefile $(PRE_BUILD_DEPS)
 # Finally, go into lib-src and make everything being built
-	+make -C lib-src $(foreach bin,$(LIBSRC_BINARIES),$(notdir $(bin)))
+	$(MAKE) -C lib-src $(foreach bin,$(LIBSRC_BINARIES),$(notdir $(bin)))
 
 .PHONY: clean maintainer-clean distclean
 clean: