Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use ui::LayerStack"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-08-13 21:06:32 +00:00
committed by Android (Google) Code Review
parent 2ba398a346 989de3d470
commit 24beb0a31d
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmds/bootanimation/BootAnimation.cpp
View File

@@ -527,16 +527,15 @@ status_t BootAnimation::readyToRun() {
// In the case of multi-display, boot animation shows on the specified displays
// in addition to the primary display
auto ids = SurfaceComposerClient::getPhysicalDisplayIds();
constexpr uint32_t LAYER_STACK = 0;
for (auto id : physicalDisplayIds) {
const auto ids = SurfaceComposerClient::getPhysicalDisplayIds();
for (const auto id : physicalDisplayIds) {
if (std::find(ids.begin(), ids.end(), id) != ids.end()) {
sp<IBinder> token = SurfaceComposerClient::getPhysicalDisplayToken(id);
if (token != nullptr)
t.setDisplayLayerStack(token, LAYER_STACK);
if (const auto token = SurfaceComposerClient::getPhysicalDisplayToken(id)) {
t.setDisplayLayerStack(token, ui::DEFAULT_LAYER_STACK);
}
}
}
t.setLayerStack(control, LAYER_STACK);
t.setLayerStack(control, ui::DEFAULT_LAYER_STACK);
}
t.setLayer(control, 0x40000000)

4
core/jni/android_view_SurfaceControl.cpp
View File

@@ -814,7 +814,7 @@ static void nativeSetLayerStack(JNIEnv* env, jclass clazz, jlong transactionObj,
auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);
SurfaceControl* const ctrl = reinterpret_cast<SurfaceControl *>(nativeObject);
transaction->setLayerStack(ctrl, layerStack);
transaction->setLayerStack(ctrl, ui::LayerStack::fromValue(layerStack));
}
static void nativeSetShadowRadius(JNIEnv* env, jclass clazz, jlong transactionObj,
@@ -1013,7 +1013,7 @@ static void nativeSetDisplayLayerStack(JNIEnv* env, jclass clazz,
{
auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);
transaction->setDisplayLayerStack(token, layerStack);
transaction->setDisplayLayerStack(token, ui::LayerStack::fromValue(layerStack));
}
}

3
libs/input/SpriteController.cpp
View File

@@ -168,7 +168,8 @@ void SpriteController::doUpdateSprites() {
// If surface is a new one, we have to set right layer stack.
if (update.surfaceChanged || update.state.dirty & DIRTY_DISPLAY_ID) {
t.setLayerStack(update.state.surfaceControl, update.state.displayId);
t.setLayerStack(update.state.surfaceControl,
ui::LayerStack::fromValue(update.state.displayId));
needApplyTransaction = true;
}
}