Moved res-ics to ics/res, and res, src, AndroidManifest to main/. This fits more to the "canonical layout" expected by gradle, and works around the issue where blaze is expecting every res directory used by a target to be named the same (including its library dependencies and its transitive dependencies). Change-Id: I658e3c0a67a01f379c43d3fad82cd40f9aa8cd28
45 lines
1.7 KiB
XML
45 lines
1.7 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
Copyright (C) 2015 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.
|
|
-->
|
|
|
|
<merge xmlns:android="http://schemas.android.com/apk/res/android">
|
|
|
|
<view class="com.android.setupwizardlib.view.NavigationBar$NavButton"
|
|
android:id="@+id/suw_navbar_back"
|
|
style="@style/SuwNavBarButtonStyle"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:contentDescription="@string/suw_back_button_label"
|
|
android:drawableLeft="?attr/suwNavBarBackButton"
|
|
android:drawableStart="?attr/suwNavBarBackButton" />
|
|
|
|
<Space
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="1" />
|
|
|
|
<view class="com.android.setupwizardlib.view.NavigationBar$NavButton"
|
|
android:id="@+id/suw_navbar_next"
|
|
style="@style/SuwNavBarButtonStyle"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:drawableEnd="?attr/suwNavBarNextButton"
|
|
android:drawableRight="?attr/suwNavBarNextButton"
|
|
android:gravity="end|center_vertical"
|
|
android:text="@string/suw_next_button_label" />
|
|
|
|
</merge>
|