diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/install_confirm.xml | 4 | ||||
| -rw-r--r-- | res/layout/permissions_list.xml | 47 |
2 files changed, 49 insertions, 2 deletions
diff --git a/res/layout/install_confirm.xml b/res/layout/install_confirm.xml index 753a24b6..ed7f33b5 100644 --- a/res/layout/install_confirm.xml +++ b/res/layout/install_confirm.xml @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <HorizontalScrollView + <HorizontalScrollView android:id="@+id/tabscontainer" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@*android:drawable/tab_unselected_holo" @@ -115,7 +115,7 @@ android:layout_height="wrap_content" android:layout_gravity="right" android:layout_weight="1" - android:text="@string/install" + android:text="@string/next" android:maxLines="2" android:filterTouchesWhenObscured="true" style="?android:attr/buttonBarButtonStyle" /> diff --git a/res/layout/permissions_list.xml b/res/layout/permissions_list.xml new file mode 100644 index 00000000..55eb81dd --- /dev/null +++ b/res/layout/permissions_list.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 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. +--> + +<!-- +This is the structure for the list of all permissions. +--> +<com.android.packageinstaller.CaffeinatedScrollView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/scrollview" + android:fillViewport="true"> + <LinearLayout + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <LinearLayout android:id="@+id/privacylist" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <TextView + style="?android:attr/listSeparatorTextViewStyle" + android:layout_marginTop="8dip" + android:text="@string/privacyPerms" /> + </LinearLayout> + <LinearLayout android:id="@+id/devicelist" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <TextView + style="?android:attr/listSeparatorTextViewStyle" + android:layout_marginTop="8dip" + android:text="@string/devicePerms" /> + </LinearLayout> + </LinearLayout> +</com.android.packageinstaller.CaffeinatedScrollView> |