Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0e45675 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Hide navigation bar on Keyguard."

parents a8fb4a2d a6310293

packages/SystemUI/res/layout/keyguard_bottom_area.xml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2014 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

  -->



<com.android.systemui.statusbar.phone.KeyguardBottomAreaView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"

    android:id="@+id/keyguard_bottom_area"

    android:layout_height="match_parent"

    android:layout_width="match_parent"

    >

    <com.android.systemui.statusbar.policy.KeyButtonView

        android:id="@+id/camera_button"

        android:layout_height="80dp"

        android:layout_width="80dp"

        android:layout_gravity="bottom|right"

        android:src="@drawable/ic_sysbar_camera"

        android:scaleType="center"

        android:contentDescription="@string/accessibility_camera_button"

        systemui:glowBackground="@drawable/ic_sysbar_highlight_land" />

</com.android.systemui.statusbar.phone.KeyguardBottomAreaView>
 
 No newline at end of file

packages/SystemUI/res/layout/navigation_bar.xml

+0 −12
Original line number Diff line number Diff line
@@ -159,18 +159,6 @@ 
                android:visibility="gone"

                android:contentDescription="@string/accessibility_search_light"

                />



            <com.android.systemui.statusbar.policy.KeyButtonView

                android:id="@+id/camera_button"

                android:layout_height="match_parent"

                android:layout_width="80dp"

                android:layout_gravity="center_vertical|right"

                android:src="@drawable/ic_sysbar_camera"

                android:scaleType="center"

                android:visibility="gone"

                android:contentDescription="@string/accessibility_camera_button"

                systemui:glowBackground="@drawable/ic_sysbar_highlight_land"

                />

        </FrameLayout>



        <com.android.systemui.statusbar.policy.DeadZone

packages/SystemUI/res/layout/status_bar_expanded.xml

+4 −0
Original line number Diff line number Diff line
@@ -90,4 +90,8 @@ 
                    />

        </FrameLayout>

    </LinearLayout>



    <include

        layout="@layout/keyguard_bottom_area"

        android:visibility="gone" />

</com.android.systemui.statusbar.phone.NotificationPanelView><!-- end of sliding panel -->

packages/SystemUI/res/layout/super_status_bar.xml

+2 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:focusable="true"

    android:fitsSystemWindows="true"

    android:descendantFocusability="afterDescendants">



    <include layout="@layout/status_bar"
@@ -33,8 +34,7 @@ 
        android:id="@+id/panel_holder"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginTop="@dimen/panel_holder_padding_top"

        android:layout_marginBottom="@dimen/navigation_bar_height">

        android:layout_marginTop="@dimen/panel_holder_padding_top">

        <include layout="@layout/status_bar_expanded"

            android:layout_width="@dimen/notification_panel_width"

            android:layout_height="wrap_content"

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+0 −5
Original line number Diff line number Diff line
@@ -1271,11 +1271,6 @@ public class KeyguardViewMediator extends SystemUI { 
                // (like recents). Temporary enable/disable (e.g. the "back" button) are

                // done in KeyguardHostView.

                flags |= StatusBarManager.DISABLE_RECENT;

                if ((isSecure() && !mAllowNotificationsWhenSecure)

                        || !ENABLE_INSECURE_STATUS_BAR_EXPAND) {

                    // showing secure lockscreen; disable expanding.

                    flags |= StatusBarManager.DISABLE_EXPAND;

                }

                if (isSecure()) {

                    // showing secure lockscreen; disable ticker and switch private notifications

                    // to show their public versions, if available.