Merge "Change Nav bar style to use system nav (new style for Nexus N+) Bug: 27612740" into nyc-mr1-dev

am: bab65d9fc4

* commit 'bab65d9fc41836624bf385898ad21ca14d2f72fe':
  Change Nav bar style to use system nav (new style for Nexus N+) Bug: 27612740

Change-Id: Icb6c321b7382fe3816cde21e9db72b07f7ba0084
This commit is contained in:
Anna Galusza
2016-05-31 16:45:39 +00:00
committed by android-build-merger
3 changed files with 4 additions and 84 deletions

View File

@@ -1,36 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016 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.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
android:id="@+id/suw_main_content"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
<com.android.setupwizardlib.view.NavigationBar
android:id="@+id/suw_navigation_bar"
style="@style/SuwNavBarTheme"
android:layout_width="match_parent"
android:layout_height="@dimen/suw_navbar_height"
android:accessibilityTraversalAfter="@id/suw_main_content" />
</LinearLayout>