summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJosh Guilfoyle <jasta00@gmail.com>2011-02-04 11:22:05 -0800
committerJosh Guilfoyle <jasta00@gmail.com>2011-02-04 14:50:32 -0800
commitb6c3e53c9982ccab438a2a64bf1b0b4e9b42fdc1 (patch)
treebf55beaa3db1dbdf919e9de63b4492e00bd9ae98 /include
parentbe0f217ff7fd402cc6c1e55438a1e1e53f640194 (diff)
downloadframeworks_base-b6c3e53c9982ccab438a2a64bf1b0b4e9b42fdc1.zip
frameworks_base-b6c3e53c9982ccab438a2a64bf1b0b4e9b42fdc1.tar.gz
frameworks_base-b6c3e53c9982ccab438a2a64bf1b0b4e9b42fdc1.tar.bz2
Corrected whitespace trespasses.
Many small whitespace mistakes slipped into the framework as the themes feature was developed. This patch reverts them to make a cleaner patch set against android-2.3.1_r1. Change-Id: I52223c1d572d4f013e37bebc5c11bb7b1c595eb3
Diffstat (limited to 'include')
-rw-r--r--include/utils/AssetManager.h18
-rw-r--r--include/utils/ResourceTypes.h2
2 files changed, 10 insertions, 10 deletions
diff --git a/include/utils/AssetManager.h b/include/utils/AssetManager.h
index f374cae..88c75cf 100644
--- a/include/utils/AssetManager.h
+++ b/include/utils/AssetManager.h
@@ -81,8 +81,8 @@ public:
virtual ~AssetManager(void);
static int32_t getGlobalCount();
-
- /*
+
+ /*
* Add a new source for assets. This can be called multiple times to
* look in multiple places for assets. It can be either a directory (for
* finding assets as raw files on the disk) or a ZIP file. This newly
@@ -95,13 +95,13 @@ public:
*/
bool addAssetPath(const String8& path, void** cookie);
- /*
+ /*
* Convenience for adding the standard system assets. Uses the
* ANDROID_ROOT environment variable to find them.
*/
bool addDefaultAssets();
- /*
+ /*
* Iterate over the asset paths in this manager. (Previously
* added via addAssetPath() and addDefaultAssets().) On first call,
* 'cookie' must be NULL, resulting in the first cookie being returned.
@@ -110,7 +110,7 @@ public:
*/
void* nextAssetPath(void* cookie) const;
- /*
+ /*
* Return an asset path in the manager. 'which' must be between 0 and
* countAssetPaths().
*/
@@ -194,7 +194,7 @@ public:
*/
FileType getFileType(const char* fileName);
- /*
+ /*
* Return the complete resource table to find things in the package.
*/
const ResTable& getResources(bool required = true) const;
@@ -213,7 +213,7 @@ public:
* the current data.
*/
bool isUpToDate();
-
+
/**
* Get the known locales for this asset manager object.
*/
@@ -291,7 +291,7 @@ private:
ResTable* setResourceTable(ResTable* res);
bool isUpToDate();
-
+
protected:
~SharedZip();
@@ -338,7 +338,7 @@ private:
static String8 getPathName(const char* path);
bool isUpToDate();
-
+
private:
void closeZip(int idx);
diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h
index bae6b92..d762a13 100644
--- a/include/utils/ResourceTypes.h
+++ b/include/utils/ResourceTypes.h
@@ -2015,7 +2015,7 @@ private:
const ResTable_package* const pkg, const Header* const header);
void print_value(const Package* pkg, const Res_value& value) const;
-
+
mutable Mutex mLock;
status_t mError;