diff options
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/dumpsys/dumpsys.cpp | 2 | ||||
| -rw-r--r-- | cmds/flatland/Main.cpp | 80 | ||||
| -rw-r--r-- | cmds/service/service.cpp | 17 |
3 files changed, 92 insertions, 7 deletions
diff --git a/cmds/dumpsys/dumpsys.cpp b/cmds/dumpsys/dumpsys.cpp index c9fcc00..7cd5afd 100644 --- a/cmds/dumpsys/dumpsys.cpp +++ b/cmds/dumpsys/dumpsys.cpp @@ -9,7 +9,7 @@ #include <binder/Parcel.h> #include <binder/ProcessState.h> #include <binder/IServiceManager.h> -#include <utils/TextOutput.h> +#include <binder/TextOutput.h> #include <utils/Vector.h> #include <getopt.h> diff --git a/cmds/flatland/Main.cpp b/cmds/flatland/Main.cpp index 99715d3..d6ac3d2 100644 --- a/cmds/flatland/Main.cpp +++ b/cmds/flatland/Main.cpp @@ -56,7 +56,7 @@ struct BenchmarkDesc { static const BenchmarkDesc benchmarks[] = { { "16:10 Single Static Window", - 2560, 1600, { 800, 1600, 2400 }, + 2560, 1600, { 800, 1200, 1600, 2400 }, { { // Window 0, staticGradient, opaque, @@ -73,8 +73,26 @@ static const BenchmarkDesc benchmarks[] = { }, }, + { "3:2 Single Static Window", + 2048, 1536, { 1536 }, + { + { // Window + 0, staticGradient, opaque, + 0, 50, 2048, 1440, + }, + { // Status bar + 0, staticGradient, opaque, + 0, 0, 2048, 50, + }, + { // Navigation bar + 0, staticGradient, opaque, + 0, 1440, 2048, 96, + }, + }, + }, + { "16:10 App -> Home Transition", - 2560, 1600, { 800, 1600, 2400 }, + 2560, 1600, { 800, 1200, 1600, 2400 }, { { // Wallpaper 0, staticGradient, opaque, @@ -99,8 +117,34 @@ static const BenchmarkDesc benchmarks[] = { }, }, + { "3:2 App -> Home Transition", + 2048, 1536, { 1536 }, + { + { // Wallpaper + 0, staticGradient, opaque, + 0, 50, 2048, 1440, + }, + { // Launcher + 0, staticGradient, blend, + 0, 50, 2048, 1440, + }, + { // Outgoing activity + 0, staticGradient, blendShrink, + 20, 70, 2048, 1400, + }, + { // Status bar + 0, staticGradient, opaque, + 0, 0, 2048, 50, + }, + { // Navigation bar + 0, staticGradient, opaque, + 0, 1440, 2048, 96, + }, + }, + }, + { "16:10 SurfaceView -> Home Transition", - 2560, 1600, { 800, 1600, 2400 }, + 2560, 1600, { 800, 1200, 1600, 2400 }, { { // Wallpaper 0, staticGradient, opaque, @@ -128,6 +172,36 @@ static const BenchmarkDesc benchmarks[] = { }, }, }, + + { "3:2 SurfaceView -> Home Transition", + 2048, 1536, { 1536 }, + { + { // Wallpaper + 0, staticGradient, opaque, + 0, 50, 2048, 1440, + }, + { // Launcher + 0, staticGradient, blend, + 0, 50, 2048, 1440, + }, + { // Outgoing SurfaceView + 0, staticGradient, blendShrink, + 20, 70, 2048, 1400, + }, + { // Outgoing activity + 0, staticGradient, blendShrink, + 20, 70, 2048, 1400, + }, + { // Status bar + 0, staticGradient, opaque, + 0, 0, 2048, 50, + }, + { // Navigation bar + 0, staticGradient, opaque, + 0, 1440, 2048, 96, + }, + }, + }, }; static const ShaderDesc shaders[] = { diff --git a/cmds/service/service.cpp b/cmds/service/service.cpp index 32db83b..97fc47c 100644 --- a/cmds/service/service.cpp +++ b/cmds/service/service.cpp @@ -1,12 +1,23 @@ /* - * Command line access to services. + * Copyright 2013 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 <binder/Parcel.h> #include <binder/ProcessState.h> #include <binder/IServiceManager.h> -#include <utils/TextOutput.h> +#include <binder/TextOutput.h> #include <getopt.h> #include <stdlib.h> |