From 93d3d02c29dd77d376250f4872969fc5c1f36233 Mon Sep 17 00:00:00 2001 From: Saalim Quadri Date: Thu, 26 Jun 2025 05:04:30 +0000 Subject: [PATCH] Revert "Disable taskbar on phones" Issue: https://gitlab.e.foundation/e/os/backlog/-/issues/3423 This reverts commit 98d33f036a14b49704e49e96611e76a28f41fba6. --- release/aconfig/bp1a/Android.bp | 1 - .../bp1a/com.android.wm.shell/Android.bp | 21 ------------------- ...r_navbar_unification_flag_values.textproto | 6 ------ ...le_taskbar_on_phones_flag_values.textproto | 6 ------ 4 files changed, 34 deletions(-) delete mode 100644 release/aconfig/bp1a/com.android.wm.shell/Android.bp delete mode 100644 release/aconfig/bp1a/com.android.wm.shell/enable_taskbar_navbar_unification_flag_values.textproto delete mode 100644 release/aconfig/bp1a/com.android.wm.shell/enable_taskbar_on_phones_flag_values.textproto diff --git a/release/aconfig/bp1a/Android.bp b/release/aconfig/bp1a/Android.bp index 4dad95558..4b782decc 100644 --- a/release/aconfig/bp1a/Android.bp +++ b/release/aconfig/bp1a/Android.bp @@ -24,6 +24,5 @@ aconfig_value_set { "aconfig-values-bp1a-com.android.permission.flags-all", "aconfig-values-bp1a-com.android.settings.flags-all", "aconfig-values-bp1a-com.android.window.flags-all", - "aconfig-values-bp1a-com.android.wm.shell-all", ], } diff --git a/release/aconfig/bp1a/com.android.wm.shell/Android.bp b/release/aconfig/bp1a/com.android.wm.shell/Android.bp deleted file mode 100644 index 735fb1cc7..000000000 --- a/release/aconfig/bp1a/com.android.wm.shell/Android.bp +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2025 Google Inc. All rights reserved. -// -// 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. - -aconfig_values { - name: "aconfig-values-bp1a-com.android.wm.shell-all", - package: "com.android.wm.shell", - srcs: [ - "*_flag_values.textproto", - ] -} diff --git a/release/aconfig/bp1a/com.android.wm.shell/enable_taskbar_navbar_unification_flag_values.textproto b/release/aconfig/bp1a/com.android.wm.shell/enable_taskbar_navbar_unification_flag_values.textproto deleted file mode 100644 index 3371a0806..000000000 --- a/release/aconfig/bp1a/com.android.wm.shell/enable_taskbar_navbar_unification_flag_values.textproto +++ /dev/null @@ -1,6 +0,0 @@ -flag_value { - package: "com.android.wm.shell" - name: "enable_taskbar_navbar_unification" - state: DISABLED - permission: READ_ONLY -} diff --git a/release/aconfig/bp1a/com.android.wm.shell/enable_taskbar_on_phones_flag_values.textproto b/release/aconfig/bp1a/com.android.wm.shell/enable_taskbar_on_phones_flag_values.textproto deleted file mode 100644 index 76c5db602..000000000 --- a/release/aconfig/bp1a/com.android.wm.shell/enable_taskbar_on_phones_flag_values.textproto +++ /dev/null @@ -1,6 +0,0 @@ -flag_value { - package: "com.android.wm.shell" - name: "enable_taskbar_on_phones" - state: DISABLED - permission: READ_ONLY -} -- GitLab