diff options
author | Michael Wright <michaelwr@google.com> | 2014-02-10 15:56:36 -0800 |
---|---|---|
committer | Michael Wright <michaelwr@google.com> | 2014-02-11 10:47:36 -0800 |
commit | d6b473713f43dec0828971854fe1018642cfaf27 (patch) | |
tree | 4f946766a00098f6f7e33ed74a6e6df7dbab40df /include/androidfw | |
parent | 66ebe94757b18146d429855274e451545ed7ea75 (diff) | |
download | frameworks_base-d6b473713f43dec0828971854fe1018642cfaf27.zip frameworks_base-d6b473713f43dec0828971854fe1018642cfaf27.tar.gz frameworks_base-d6b473713f43dec0828971854fe1018642cfaf27.tar.bz2 |
Move inputservice over to frameworks/native
Remove all of the pieces except the PointerController and SpriteController over
to frameworks/native in preparation for inputflinger. Those two need to stay in
frameworks/base for now because they depend on Skia currently. In the long run
they should be merged into either the InputManager or the WindowManager rather
than as a part of the inputservice / inputflinger.
Try 2.
Change-Id: I84259356d3eb8efc5aefb9d6b311b5fc590ea3ed
Diffstat (limited to 'include/androidfw')
-rw-r--r-- | include/androidfw/PowerManager.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/include/androidfw/PowerManager.h b/include/androidfw/PowerManager.h deleted file mode 100644 index ba98db0..0000000 --- a/include/androidfw/PowerManager.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2010 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. - */ - -#ifndef _ANDROIDFW_POWER_MANAGER_H -#define _ANDROIDFW_POWER_MANAGER_H - - -namespace android { - -enum { - USER_ACTIVITY_EVENT_OTHER = 0, - USER_ACTIVITY_EVENT_BUTTON = 1, - USER_ACTIVITY_EVENT_TOUCH = 2, - - USER_ACTIVITY_EVENT_LAST = USER_ACTIVITY_EVENT_TOUCH, // Last valid event code. -}; - -} // namespace android - -#endif // _ANDROIDFW_POWER_MANAGER_H |