diff options
author | Massimo Carli <mcarli@google.com> | 2022-10-26 07:51:57 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-26 07:51:57 +0000 |
commit | 82a3d574a0a922c6d25086b19e145cbf8c3e027e (patch) | |
tree | 9cc7b112e2ca51e2f74cfae61e6416fe4e6ea64d /proto | |
parent | 17009848da8158fb480273961f612107eedbc510 (diff) | |
parent | a8117a579f4cab7479589c8efd553fdaa752c67b (diff) | |
download | base-82a3d574a0a922c6d25086b19e145cbf8c3e027e.tar.gz |
Merge "Letterbox Reacheability Multiplier Persistence" into tm-qpr-dev am: a8117a579f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19429915
Change-Id: I8949d6f923a335d88e49e84848bec7992084f1e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'proto')
-rw-r--r-- | proto/src/task_snapshot.proto | 48 | ||||
-rw-r--r-- | proto/src/windowmanager.proto | 71 |
2 files changed, 71 insertions, 48 deletions
diff --git a/proto/src/task_snapshot.proto b/proto/src/task_snapshot.proto deleted file mode 100644 index 1cbc17ed9f41..000000000000 --- a/proto/src/task_snapshot.proto +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2017 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. - */ - - syntax = "proto3"; - - package com.android.server.wm; - - option java_package = "com.android.server.wm"; - option java_outer_classname = "WindowManagerProtos"; - - message TaskSnapshotProto { - int32 orientation = 1; - int32 inset_left = 2; - int32 inset_top = 3; - int32 inset_right = 4; - int32 inset_bottom = 5; - bool is_real_snapshot = 6; - int32 windowing_mode = 7; - int32 system_ui_visibility = 8 [deprecated=true]; - bool is_translucent = 9; - string top_activity_component = 10; - // deprecated because original width and height are stored now instead of the scale. - float legacy_scale = 11 [deprecated=true]; - int64 id = 12; - int32 rotation = 13; - // The task width when the snapshot was taken - int32 task_width = 14; - // The task height when the snapshot was taken - int32 task_height = 15; - int32 appearance = 16; - int32 letterbox_inset_left = 17; - int32 letterbox_inset_top = 18; - int32 letterbox_inset_right = 19; - int32 letterbox_inset_bottom = 20; - } diff --git a/proto/src/windowmanager.proto b/proto/src/windowmanager.proto new file mode 100644 index 000000000000..f26404c66623 --- /dev/null +++ b/proto/src/windowmanager.proto @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2022 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. + */ + +syntax = "proto3"; + +package com.android.server.wm; + +option java_package = "com.android.server.wm"; +option java_outer_classname = "WindowManagerProtos"; + +message TaskSnapshotProto { + int32 orientation = 1; + int32 inset_left = 2; + int32 inset_top = 3; + int32 inset_right = 4; + int32 inset_bottom = 5; + bool is_real_snapshot = 6; + int32 windowing_mode = 7; + int32 system_ui_visibility = 8 [deprecated=true]; + bool is_translucent = 9; + string top_activity_component = 10; + // deprecated because original width and height are stored now instead of the scale. + float legacy_scale = 11 [deprecated=true]; + int64 id = 12; + int32 rotation = 13; + // The task width when the snapshot was taken + int32 task_width = 14; + // The task height when the snapshot was taken + int32 task_height = 15; + int32 appearance = 16; + int32 letterbox_inset_left = 17; + int32 letterbox_inset_top = 18; + int32 letterbox_inset_right = 19; + int32 letterbox_inset_bottom = 20; +} + +// Persistent letterboxing configurations +message LetterboxProto { + + // Possible values for the letterbox horizontal reachability + enum LetterboxHorizontalReachability { + LETTERBOX_HORIZONTAL_REACHABILITY_POSITION_LEFT = 0; + LETTERBOX_HORIZONTAL_REACHABILITY_POSITION_CENTER = 1; + LETTERBOX_HORIZONTAL_REACHABILITY_POSITION_RIGHT = 2; + } + + // Possible values for the letterbox vertical reachability + enum LetterboxVerticalReachability { + LETTERBOX_VERTICAL_REACHABILITY_POSITION_TOP = 0; + LETTERBOX_VERTICAL_REACHABILITY_POSITION_CENTER = 1; + LETTERBOX_VERTICAL_REACHABILITY_POSITION_BOTTOM = 2; + } + + // Represents the current horizontal position for the letterboxed activity + LetterboxHorizontalReachability letterbox_position_for_horizontal_reachability = 1; + // Represents the current vertical position for the letterboxed activity + LetterboxVerticalReachability letterbox_position_for_vertical_reachability = 2; +}
\ No newline at end of file |