diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/androidfw/Asset.h | 17 | ||||
-rw-r--r-- | include/androidfw/AssetManager.h | 17 | ||||
-rw-r--r-- | include/androidfw/KeycodeLabels.h | 17 | ||||
-rw-r--r-- | include/androidfw/ResourceTypes.h | 17 | ||||
-rw-r--r-- | include/binder/CursorWindow.h | 4 | ||||
-rw-r--r-- | include/gui/Surface.h | 17 | ||||
-rw-r--r-- | include/gui/SurfaceComposerClient.h | 17 | ||||
-rw-r--r-- | include/utils/KeyedVector.h | 6 | ||||
-rw-r--r-- | include/utils/ResourceTypes.h | 10 |
9 files changed, 112 insertions, 10 deletions
diff --git a/include/androidfw/Asset.h b/include/androidfw/Asset.h new file mode 100644 index 0000000..3c57b1c --- /dev/null +++ b/include/androidfw/Asset.h @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <utils/Asset.h> diff --git a/include/androidfw/AssetManager.h b/include/androidfw/AssetManager.h new file mode 100644 index 0000000..8cc3531 --- /dev/null +++ b/include/androidfw/AssetManager.h @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <utils/AssetManager.h> diff --git a/include/androidfw/KeycodeLabels.h b/include/androidfw/KeycodeLabels.h new file mode 100644 index 0000000..615a627 --- /dev/null +++ b/include/androidfw/KeycodeLabels.h @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <ui/KeycodeLabels.h> diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h new file mode 100644 index 0000000..70cdc88 --- /dev/null +++ b/include/androidfw/ResourceTypes.h @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <utils/ResourceTypes.h> diff --git a/include/binder/CursorWindow.h b/include/binder/CursorWindow.h index f0284de..8a2979a 100644 --- a/include/binder/CursorWindow.h +++ b/include/binder/CursorWindow.h @@ -31,8 +31,8 @@ #else -#define IF_LOG_WINDOW() IF_LOG(LOG_DEBUG, "CursorWindow") -#define LOG_WINDOW(...) LOG(LOG_DEBUG, "CursorWindow", __VA_ARGS__) +#define IF_LOG_WINDOW() IF_ALOG(LOG_DEBUG, "CursorWindow") +#define LOG_WINDOW(...) ALOG(LOG_DEBUG, "CursorWindow", __VA_ARGS__) #endif diff --git a/include/gui/Surface.h b/include/gui/Surface.h new file mode 100644 index 0000000..c1862b7 --- /dev/null +++ b/include/gui/Surface.h @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <surfaceflinger/Surface.h> diff --git a/include/gui/SurfaceComposerClient.h b/include/gui/SurfaceComposerClient.h new file mode 100644 index 0000000..6cc6390 --- /dev/null +++ b/include/gui/SurfaceComposerClient.h @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <surfaceflinger/SurfaceComposerClient.h> diff --git a/include/utils/KeyedVector.h b/include/utils/KeyedVector.h index 6bcdea4..65165a2 100644 --- a/include/utils/KeyedVector.h +++ b/include/utils/KeyedVector.h @@ -122,7 +122,7 @@ ssize_t KeyedVector<KEY,VALUE>::indexOfKey(const KEY& key) const { template<typename KEY, typename VALUE> inline const VALUE& KeyedVector<KEY,VALUE>::valueFor(const KEY& key) const { - ssize_t i = indexOfKey(key); + ssize_t i = this->indexOfKey(key); assert(i>=0); return mVector.itemAt(i).value; } @@ -139,7 +139,7 @@ const KEY& KeyedVector<KEY,VALUE>::keyAt(size_t index) const { template<typename KEY, typename VALUE> inline VALUE& KeyedVector<KEY,VALUE>::editValueFor(const KEY& key) { - ssize_t i = indexOfKey(key); + ssize_t i = this->indexOfKey(key); assert(i>=0); return mVector.editItemAt(i).value; } @@ -190,7 +190,7 @@ DefaultKeyedVector<KEY,VALUE>::DefaultKeyedVector(const VALUE& defValue) template<typename KEY, typename VALUE> inline const VALUE& DefaultKeyedVector<KEY,VALUE>::valueFor(const KEY& key) const { - ssize_t i = indexOfKey(key); + ssize_t i = this->indexOfKey(key); return i >= 0 ? KeyedVector<KEY,VALUE>::valueAt(i) : mDefault; } diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h index 612ff93..71e5324 100644 --- a/include/utils/ResourceTypes.h +++ b/include/utils/ResourceTypes.h @@ -1277,7 +1277,7 @@ struct ResTable_config myDelta += requested->screenHeightDp - screenHeightDp; otherDelta += requested->screenHeightDp - o.screenHeightDp; } - //LOGI("Comparing this %dx%d to other %dx%d in %dx%d: myDelta=%d otherDelta=%d", + //ALOGI("Comparing this %dx%d to other %dx%d in %dx%d: myDelta=%d otherDelta=%d", // screenWidthDp, screenHeightDp, o.screenWidthDp, o.screenHeightDp, // requested->screenWidthDp, requested->screenHeightDp, myDelta, otherDelta); return (myDelta <= otherDelta); @@ -1506,11 +1506,11 @@ struct ResTable_config } if (screenSizeDp != 0) { if (screenWidthDp != 0 && screenWidthDp > settings.screenWidthDp) { - //LOGI("Filtering out width %d in requested %d", screenWidthDp, settings.screenWidthDp); + //ALOGI("Filtering out width %d in requested %d", screenWidthDp, settings.screenWidthDp); return false; } if (screenHeightDp != 0 && screenHeightDp > settings.screenHeightDp) { - //LOGI("Filtering out height %d in requested %d", screenHeightDp, settings.screenHeightDp); + //ALOGI("Filtering out height %d in requested %d", screenHeightDp, settings.screenHeightDp); return false; } } @@ -1530,9 +1530,9 @@ struct ResTable_config // For compatibility, we count a request for KEYSHIDDEN_NO as also // matching the more recent KEYSHIDDEN_SOFT. Basically // KEYSHIDDEN_NO means there is some kind of keyboard available. - //LOGI("Matching keysHidden: have=%d, config=%d\n", keysHidden, setKeysHidden); + //ALOGI("Matching keysHidden: have=%d, config=%d\n", keysHidden, setKeysHidden); if (keysHidden != KEYSHIDDEN_NO || setKeysHidden != KEYSHIDDEN_SOFT) { - //LOGI("No match!"); + //ALOGI("No match!"); return false; } } |