diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/button_bar.xml | 14 | ||||
| -rw-r--r-- | res/layout/choose_data_sim_page.xml | 5 | ||||
| -rw-r--r-- | res/layout/header.xml | 29 | ||||
| -rw-r--r-- | res/layout/header_condensed.xml | 32 | ||||
| -rw-r--r-- | res/layout/logo_header.xml | 48 | ||||
| -rw-r--r-- | res/layout/mobile_data_settings.xml | 4 | ||||
| -rw-r--r-- | res/layout/setup_cyanogen_services.xml | 38 | ||||
| -rw-r--r-- | res/layout/setup_datetime_page.xml | 5 | ||||
| -rw-r--r-- | res/layout/setup_fingerprint.xml | 5 | ||||
| -rw-r--r-- | res/layout/setup_finished_page.xml | 42 | ||||
| -rw-r--r-- | res/layout/setup_loading_page.xml | 11 | ||||
| -rw-r--r-- | res/layout/setup_locale.xml | 44 | ||||
| -rw-r--r-- | res/layout/setup_lockscreen.xml | 17 | ||||
| -rw-r--r-- | res/layout/setup_modguide_page.xml | 102 | ||||
| -rw-r--r-- | res/layout/setup_welcome_page.xml | 42 | ||||
| -rw-r--r-- | res/layout/sim_missing_page.xml | 7 | ||||
| -rw-r--r-- | res/layout/terms_webview.xml | 35 |
17 files changed, 172 insertions, 308 deletions
diff --git a/res/layout/button_bar.xml b/res/layout/button_bar.xml index ae3d42d..8b8256d 100644 --- a/res/layout/button_bar.xml +++ b/res/layout/button_bar.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2015 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,13 +25,16 @@ <Button style="@style/ButtonBar.Left" android:id="@+id/prev_button" - android:layout_width="wrap_content" - android:layout_weight="1"/> + android:layout_width="0dp" + android:background="?android:attr/selectableItemBackground" + android:layout_weight="3"/> <Button style="@style/ButtonBar.Right" android:id="@+id/next_button" - android:layout_width="wrap_content" - android:text="@string/next" /> + android:layout_width="0dp" + android:background="?android:attr/selectableItemBackground" + android:text="@string/next" + android:layout_weight="2" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/choose_data_sim_page.xml b/res/layout/choose_data_sim_page.xml index c93a89f..9bfebf1 100644 --- a/res/layout/choose_data_sim_page.xml +++ b/res/layout/choose_data_sim_page.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2015 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/header" /> + <include layout="@layout/header_condensed" /> <FrameLayout android:id="@+id/page" android:layout_width="match_parent" @@ -63,5 +64,3 @@ android:visibility="gone"/> </FrameLayout> </LinearLayout> - - diff --git a/res/layout/header.xml b/res/layout/header.xml deleted file mode 100644 index e335b79..0000000 --- a/res/layout/header.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2015 The CyanogenMod 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. ---> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="@dimen/header_height" - android:background="@color/header_bg" - style="@style/Header"> - - <TextView - android:layout_width="match_parent" - android:layout_height="@dimen/page_title_height" - style="@style/PageTitle" /> - -</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/header_condensed.xml b/res/layout/header_condensed.xml index 9319836..b507b08 100644 --- a/res/layout/header_condensed.xml +++ b/res/layout/header_condensed.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2015 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,15 +16,32 @@ limitations under the License. --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="@dimen/header_condensed_height" - android:background="@color/header_condensed_bg" - style="@style/Header"> + android:id="@+id/header" + android:layout_width="match_parent" + android:layout_height="@dimen/header_condensed_height" + android:paddingTop="48dp" + android:orientation="vertical"> + + <ImageView + android:id="@+id/header_icon" + android:layout_width="64dp" + android:layout_height="wrap_content" + android:paddingStart="8dp" + android:paddingEnd="8dp" + android:adjustViewBounds="true" + android:scaleType="centerInside" + android:visibility="gone" + android:contentDescription="@null" /> <TextView android:layout_width="match_parent" - android:layout_height="@dimen/page_title_height" + android:layout_height="64dp" + android:layout_toEndOf="@id/header_icon" + android:paddingEnd="8dp" + android:typeface="monospace" + android:gravity="center_vertical" + android:maxLines="1" + android:ellipsize="end" style="@style/PageTitle" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/res/layout/logo_header.xml b/res/layout/logo_header.xml deleted file mode 100644 index 8e55740..0000000 --- a/res/layout/logo_header.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2015 The CyanogenMod 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. ---> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="@dimen/logo_header_height" - android:background="@color/primary" - style="@style/Header"> - - <ImageView - android:id="@+id/brand_logo" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/brand" - android:paddingLeft="@dimen/header_logo_margin_left" - android:paddingBottom="@dimen/header_logo_margin_bottom" - android:layout_above="@+id/powered_by_logo"/> - - <ImageView - android:id="@+id/powered_by_logo" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/powered_by" - android:visibility="gone" - android:paddingLeft="@dimen/header_logo_margin_left" - android:paddingBottom="@dimen/header_logo_margin_bottom" - android:layout_above="@android:id/title"/> - - <TextView - android:layout_width="match_parent" - android:layout_height="@dimen/page_title_height" - style="@style/PageTitle" /> - -</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/mobile_data_settings.xml b/res/layout/mobile_data_settings.xml index a74b352..6e71bdf 100644 --- a/res/layout/mobile_data_settings.xml +++ b/res/layout/mobile_data_settings.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2013 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/header" /> + <include layout="@layout/header_condensed" /> <ProgressBar android:id="@+id/progress" @@ -102,4 +103,3 @@ </ScrollView> </FrameLayout> </LinearLayout> - diff --git a/res/layout/setup_cyanogen_services.xml b/res/layout/setup_cyanogen_services.xml index 3ab26c7..203376a 100644 --- a/res/layout/setup_cyanogen_services.xml +++ b/res/layout/setup_cyanogen_services.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2015 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -209,7 +210,42 @@ android:text="@string/services_os_nav_keys_label"/> </LinearLayout> + + <LinearLayout + android:id="@+id/privacy_guard" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="@dimen/location_margin_left" + android:paddingRight="@dimen/content_margin_right" + android:background="?android:attr/selectableItemBackground" + android:clickable="true"> + + <CheckBox + android:id="@+id/privacy_guard_checkbox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="top" + android:layout_marginTop="5dp" + android:duplicateParentState="true" + android:clickable="false" /> + + <TextView + android:id="@+id/privacy_guard_summary" + android:layout_width="0px" + android:layout_height="wrap_content" + android:layout_weight="1" + android:textSize="15sp" + android:lineSpacingExtra="@dimen/setup_line_spacing" + android:gravity="top" + android:layout_marginLeft="@dimen/location_text_margin_left" + android:layout_marginRight="@dimen/location_text_margin_right" + android:paddingBottom="@dimen/content_margin_bottom" + android:text="@string/services_os_privacy_guard"/> + + </LinearLayout> + </LinearLayout> </ScrollView> </FrameLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/setup_datetime_page.xml b/res/layout/setup_datetime_page.xml index b1bfb3f..47d9346 100644 --- a/res/layout/setup_datetime_page.xml +++ b/res/layout/setup_datetime_page.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2013 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/header" /> + <include layout="@layout/header_condensed" /> <FrameLayout android:id="@+id/page" android:layout_width="match_parent" @@ -109,4 +110,4 @@ </LinearLayout> </ScrollView> </FrameLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/setup_fingerprint.xml b/res/layout/setup_fingerprint.xml index 6af8519..4e9d319 100644 --- a/res/layout/setup_fingerprint.xml +++ b/res/layout/setup_fingerprint.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2015 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/header" /> + <include layout="@layout/header_condensed" /> <FrameLayout android:id="@+id/page" android:layout_width="match_parent" @@ -87,4 +88,4 @@ </LinearLayout> </ScrollView> </FrameLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/setup_finished_page.xml b/res/layout/setup_finished_page.xml index 0f96893..5429cba 100644 --- a/res/layout/setup_finished_page.xml +++ b/res/layout/setup_finished_page.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2013 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -25,41 +26,16 @@ android:layout_weight="1"/> <ImageView - android:id="@+id/brand_logo" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:src="@drawable/brand_finish" - android:scaleType="centerInside" - android:padding="@dimen/content_margin_left"/> - - - - <TextView android:id="@+id/mod_welcome" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textSize="20sp" - android:layout_marginTop="105dp" - android:paddingLeft="@dimen/content_margin_left" - android:paddingRight="@dimen/content_margin_right" - android:text="@string/mod_welcome" - android:fontFamily="sans-serif-medium" - android:textColor="@color/white" - android:visibility="gone"/> - - - <TextView android:id="@+id/mod_desc" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textSize="16sp" - android:layout_marginTop="16dp" - android:paddingLeft="@dimen/content_margin_left" - android:paddingRight="@dimen/content_margin_right" - android:text="@string/mod_description" - android:textColor="@color/white" - android:visibility="gone"/> + android:id="@+id/brand_logo" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:src="@drawable/logo" + android:adjustViewBounds="true" + android:scaleType="fitCenter" + android:padding="@dimen/content_margin_left"/> <Space android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="1"/> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/setup_loading_page.xml b/res/layout/setup_loading_page.xml index 388095e..c65bbbf 100644 --- a/res/layout/setup_loading_page.xml +++ b/res/layout/setup_loading_page.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2015 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,14 +20,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/header" /> + <include layout="@layout/header_condensed" /> <ProgressBar android:id="@+id/progressBar1" style="?android:attr/progressBarStyleHorizontal" android:indeterminateOnly="true" android:layout_width="match_parent" - android:layout_height="8dp" /> + android:layout_height="8dp" + android:paddingStart="0dp" + android:paddingEnd="0dp" /> <FrameLayout android:id="@+id/page" android:layout_width="match_parent" @@ -34,7 +37,3 @@ android:layout_weight="1" style="@style/PageContent"/> </LinearLayout> - - - - diff --git a/res/layout/setup_locale.xml b/res/layout/setup_locale.xml new file mode 100644 index 0000000..43074b1 --- /dev/null +++ b/res/layout/setup_locale.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2013 The CyanogenMod Project + Copyright (C) 2017 The LineageOS 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:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include layout="@layout/header_condensed" /> + + <RelativeLayout android:id="@+id/page" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:gravity="center" + android:paddingLeft="@dimen/content_margin_left" + android:paddingRight="@dimen/content_margin_left" + style="@style/PageContent"> + + <com.cyanogenmod.setupwizard.ui.LocalePicker + android:id="@+id/locale_list" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:focusable="true" + android:focusableInTouchMode="true" + android:layout_alignParentBottom="true" + android:layout_centerHorizontal="true"/> + + </RelativeLayout> +</LinearLayout> diff --git a/res/layout/setup_lockscreen.xml b/res/layout/setup_lockscreen.xml index 20f06bd..25f7c01 100644 --- a/res/layout/setup_lockscreen.xml +++ b/res/layout/setup_lockscreen.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2015 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/header" /> + <include layout="@layout/header_condensed" /> <FrameLayout android:id="@+id/page" android:layout_width="match_parent" @@ -34,6 +35,8 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingStart="@dimen/content_margin_left" + android:paddingEnd="@dimen/content_margin_left" style="@style/PageContent"> <TextView @@ -41,21 +44,23 @@ android:layout_height="wrap_content" style="@style/PageSummaryText" android:textSize="16sp" - android:paddingLeft="@dimen/content_margin_left" android:layout_marginBottom="@dimen/summary_margin_bottom" android:paddingRight="@dimen/location_text_margin_right" android:text="@string/lockscreen_setup_summary" /> - <TextView + <Button android:id="@+id/setup_lockscreen" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="@dimen/content_margin_left" android:paddingRight="@dimen/location_text_margin_right" - android:gravity="center_vertical" + android:gravity="center" android:textSize="16sp" android:textAllCaps="true" - android:textColor="@color/accent" + android:textColor="@color/white" + android:background="@color/accent" + android:maxLines="1" + android:ellipsize="end" android:text="@string/lockscreen_setup_screen_lock_setup"/> </LinearLayout> diff --git a/res/layout/setup_modguide_page.xml b/res/layout/setup_modguide_page.xml deleted file mode 100644 index beec6eb..0000000 --- a/res/layout/setup_modguide_page.xml +++ /dev/null @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2013 The CyanogenMod 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" - xmlns:tools="http://schemas.android.com/tools" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/mod_yellow"> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="296dp"> - <ImageView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scaleType="centerCrop" - android:src="@drawable/img_oobe_hero" - tools:ignore="ContentDescription"/> - <ImageView - android:layout_width="140dp" - android:layout_height="32dp" - android:src="@drawable/ic_logo_mod_title" - android:tint="@color/white" - android:layout_marginTop="72dp" - android:layout_marginStart="24dp" - tools:ignore="ContentDescription"/> - </FrameLayout> - - <TextView android:id="@+id/mod_welcome" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="20sp" - android:textSize="16sp" - android:fontFamily="sans-serif" - android:layout_marginTop="32dp" - android:paddingStart="24dp" - android:paddingEnd="24dp" - android:text="@string/mod_welcome" - android:textColor="@color/mod_title"/> - - <TextView android:id="@+id/mod_desc" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:fontFamily="sans-serif" - android:textSize="14sp" - android:lineSpacingExtra="6sp" - android:layout_marginTop="3dp" - android:paddingStart="24dp" - android:paddingEnd="24dp" - android:text="@string/mod_description" - android:textColor="@color/mod_description"/> - - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="72dp" - android:minWidth="208dp" - android:layout_marginTop="25dp" - android:layout_marginStart="24dp" - android:background="@drawable/btn_mod_oobe"> - - <LinearLayout - android:id="@+id/explore_mod_guide" - android:layout_width="wrap_content" - android:layout_height="40dp" - android:minWidth="176dp" - android:orientation="horizontal"> - - <ImageView - android:layout_width="24dp" - android:layout_height="24dp" - android:src="@mipmap/ic_modguide" - android:layout_margin="8dp" - tools:ignore="ContentDescription"/> - - <TextView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:gravity="center_vertical" - android:fontFamily="sans-serif" - android:text="@string/mod_explore" - android:textAllCaps="false" - android:textColor="@color/mod_title"/> - </LinearLayout> - </FrameLayout> -</LinearLayout> diff --git a/res/layout/setup_welcome_page.xml b/res/layout/setup_welcome_page.xml index c45e77e..a75c64d 100644 --- a/res/layout/setup_welcome_page.xml +++ b/res/layout/setup_welcome_page.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2013 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,27 +18,24 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include layout="@layout/logo_header" /> - - <RelativeLayout android:id="@+id/page" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:gravity="center" - android:paddingLeft="@dimen/content_margin_left" - android:paddingRight="@dimen/content_margin_left" - style="@style/PageContent"> - - <com.cyanogenmod.setupwizard.ui.LocalePicker - android:id="@+id/locale_list" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:focusable="true" - android:focusableInTouchMode="true" - android:layout_centerInParent="true"/> - - </RelativeLayout> + android:layout_height="match_parent" + android:background="@color/primary"> + + <Space android:layout_width="match_parent" + android:layout_height="0px" + android:layout_weight="1"/> + + <ImageView + android:id="@+id/brand_logo" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:src="@drawable/logo" + android:adjustViewBounds="true" + android:scaleType="fitCenter" + android:padding="@dimen/content_margin_left"/> + + <Space android:layout_width="match_parent" + android:layout_height="0px" + android:layout_weight="1"/> </LinearLayout> diff --git a/res/layout/sim_missing_page.xml b/res/layout/sim_missing_page.xml index 8bd8607..3722dd1 100644 --- a/res/layout/sim_missing_page.xml +++ b/res/layout/sim_missing_page.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2015 The CyanogenMod Project + Copyright (C) 2017 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/header" /> + <include layout="@layout/header_condensed" /> <FrameLayout android:id="@+id/page" android:layout_width="match_parent" @@ -54,7 +55,3 @@ </LinearLayout> </FrameLayout> </LinearLayout> - - - - diff --git a/res/layout/terms_webview.xml b/res/layout/terms_webview.xml deleted file mode 100644 index cfd44a9..0000000 --- a/res/layout/terms_webview.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2013 The CyanogenMod 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. ---> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <View - android:layout_height="match_parent" - android:layout_width="match_parent" - android:layout_weight="1" /> - </LinearLayout> - - <WebView - android:id="@+id/webview" - android:layout_width="match_parent" - android:layout_height="match_parent" /> -</FrameLayout> |