am 8a67598e: am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert option...

[android/aapt.git] / AaptAssets.h

diff --git a/AaptAssets.h b/AaptAssets.h
index 1c653e1fb77ae55a86f785f1f0cc4732804c543d..5cfa913500639f39e67f6a8601a8126318cfe5b0 100644 (file)
--- a/AaptAssets.h
+++ b/AaptAssets.h
@@ -7,14 +7,14 @@
 #define __AAPT_ASSETS_H
 
 #include <stdlib.h>
 #define __AAPT_ASSETS_H
 
 #include <stdlib.h>

-#include <utils/AssetManager.h>
+#include <androidfw/AssetManager.h>
+#include <androidfw/ResourceTypes.h>

 #include <utils/KeyedVector.h>
 #include <utils/KeyedVector.h>

-#include <utils/String8.h>
-#include <utils/ResourceTypes.h>
+#include <utils/RefBase.h>

 #include <utils/SortedVector.h>
 #include <utils/String8.h>
 #include <utils/SortedVector.h>
 #include <utils/String8.h>

+#include <utils/String8.h>

 #include <utils/Vector.h>
 #include <utils/Vector.h>

-#include <utils/RefBase.h>

 #include "ZipFile.h"
 
 #include "Bundle.h"
 #include "ZipFile.h"
 
 #include "Bundle.h"


@@ -22,6 +22,10 @@
 
 using namespace android;
 
 
 using namespace android;
 

+
+extern const char * const gDefaultIgnoreAssets;
+extern const char * gUserIgnoreAssets;
+

 bool valid_symbol_name(const String8& str);
 
 class AaptAssets;
 bool valid_symbol_name(const String8& str);
 
 class AaptAssets;


@@ -47,6 +51,7 @@ enum {
     AXIS_SMALLESTSCREENWIDTHDP,
     AXIS_SCREENWIDTHDP,
     AXIS_SCREENHEIGHTDP,
     AXIS_SMALLESTSCREENWIDTHDP,
     AXIS_SCREENWIDTHDP,
     AXIS_SCREENHEIGHTDP,

+    AXIS_LAYOUTDIR,

     AXIS_VERSION,
 
     AXIS_START = AXIS_MCC,
     AXIS_VERSION,
 
     AXIS_START = AXIS_MCC,


@@ -91,6 +96,7 @@ public:
     static bool getSmallestScreenWidthDpName(const char* name, ResTable_config* out = NULL);
     static bool getScreenWidthDpName(const char* name, ResTable_config* out = NULL);
     static bool getScreenHeightDpName(const char* name, ResTable_config* out = NULL);
     static bool getSmallestScreenWidthDpName(const char* name, ResTable_config* out = NULL);
     static bool getScreenWidthDpName(const char* name, ResTable_config* out = NULL);
     static bool getScreenHeightDpName(const char* name, ResTable_config* out = NULL);

+    static bool getLayoutDirectionName(const char* name, ResTable_config* out = NULL);

     static bool getVersionName(const char* name, ResTable_config* out = NULL);
 
     int compare(const AaptGroupEntry& o) const;
     static bool getVersionName(const char* name, ResTable_config* out = NULL);
 
     int compare(const AaptGroupEntry& o) const;


@@ -129,6 +135,7 @@ private:
     String8 navHidden;
     String8 navigation;
     String8 screenSize;
     String8 navHidden;
     String8 navigation;
     String8 screenSize;

+    String8 layoutDirection;

     String8 version;
 
     mutable bool mParamsChanged;
     String8 version;
 
     mutable bool mParamsChanged;