diff options
| author | Cole Faust <colefaust@google.com> | 2021-01-15 18:22:00 -0800 |
|---|---|---|
| committer | Cole Faust <colefaust@google.com> | 2021-01-27 10:38:30 -0800 |
| commit | a268e5e7195cc584c26047ddccf91c9688d9f914 (patch) | |
| tree | f5d1348b0709a2d77cd6581198903abd40b24173 /res/layout | |
| parent | f69993c0a8853a3cd41ff0ccd547264cb9fa6011 (diff) | |
| download | Calendar-a268e5e7195cc584c26047ddccf91c9688d9f914.tar.gz | |
Update toolbar usage
Use car-ui-lib's base layout style of
toolbar, the old one is deprecated.
Also in this cl: removing an unneccesary
<provider> tag from the manifest, and using
sdk_version: current instead of system_current
to completely unbundle calendar.
Fixes: 177703290
Test: atest CarCalendarUiTests CarCalendarUnitTests
Change-Id: I5690b23933cb074acde6d4bc08f4d656f5c7db91
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/calendar.xml | 41 |
1 files changed, 14 insertions, 27 deletions
diff --git a/res/layout/calendar.xml b/res/layout/calendar.xml index 56de478..7fb0bb0 100644 --- a/res/layout/calendar.xml +++ b/res/layout/calendar.xml @@ -13,36 +13,23 @@ See the License for the specific language governing permissions and limitations under the License. --> -<LinearLayout +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent" - android:layout_width="match_parent" - android:orientation="vertical"> - - <com.android.car.ui.toolbar.Toolbar - android:id="@+id/toolbar" + android:layout_width="match_parent"> + <com.android.car.ui.recyclerview.CarUiRecyclerView + android:id="@+id/events" android:layout_width="match_parent" - android:layout_height="wrap_content" - app:title="@string/app_name" + android:layout_height="match_parent" /> - <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent"> - <com.android.car.ui.recyclerview.CarUiRecyclerView - android:id="@+id/events" - android:layout_width="match_parent" - android:layout_height="match_parent" - /> - - <TextView - android:id="@+id/no_events_text" - android:maxWidth="200dp" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_margin="@dimen/car_ui_list_item_start_inset" - android:gravity="center" - android:textAppearance="@style/NoEventsText"/> - - </FrameLayout> + <TextView + android:id="@+id/no_events_text" + android:maxWidth="200dp" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_margin="@dimen/car_ui_list_item_start_inset" + android:gravity="center" + android:textAppearance="@style/NoEventsText"/> -</LinearLayout> +</FrameLayout> |