commit a884f4d0f635083e2cb51e733e093bd73c898874
author Ed Heyl <edheyl@google.com> Fri Mar 05 11:59:58 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 05 11:59:58 2010 -0800
tree 158cbec3bca0103f5c7257d3692eba99f00c039b
parent 2fcfbf3e6c14f2901648a1aaf002e119bf11c673
parent 30f82b8c5247dce6b507e5ce2ef3fbb6bd0f913a

Merge "Change an aapt "warning" from "*** " to "**** " (from three to four stars). "*** " (three stars and a space) is the 'magic make error string'; so this change makes it easier to find the real issues/errors in build logs.  Besides, other aapt messages are "**** "."

include/utils/ResourceTypes.h

diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h
index cbcef4e..0e796dc 100644
--- a/include/utils/ResourceTypes.h
+++ b/include/utils/ResourceTypes.h
@@ -946,7 +946,8 @@
         MASK_UI_MODE_TYPE = 0x0f,
         UI_MODE_TYPE_ANY = 0x00,
         UI_MODE_TYPE_NORMAL = 0x01,
-        UI_MODE_TYPE_CAR = 0x02,
+        UI_MODE_TYPE_DESK = 0x02,
+        UI_MODE_TYPE_CAR = 0x03,
 
         // uiMode bits for the night switch.
         MASK_UI_MODE_NIGHT = 0x30,