Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e42bdba authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'issue-6' into 'v1-nougat' 

Dialer add About info

See merge request e/os/android_packages_apps_Dialer!10
parents 6c553dcc ea5d3bb3

AndroidManifest.xml

+15 −0
Original line number Diff line number Diff line
@@ -264,6 +264,21 @@ 
                  android:theme="@style/BackgroundOnlyTheme">

        </activity>



         <activity

            android:name="com.android.dialer.about.LicenseMenuActivity"

            android:label="@string/licenseActivityLabel"

            android:exported="true"

            android:theme="@style/Theme.AppCompat.Light">

        </activity>



        <activity

            android:name="com.android.dialer.about.LicenseActivity"

            android:label="@string/licenseActivityLabel"

            android:exported="false"

            android:theme="@style/Theme.AppCompat.Light">

        </activity>





        <activity android:name="com.android.contacts.common.vcard.CancelActivity"

                  android:theme="@style/BackgroundOnlyTheme"/>

res/layout/license.xml

0 → 100644
+40 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2017 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="wrap_content"

        android:minHeight="?android:attr/listPreferredItemHeight"

        android:gravity="center_vertical"

        android:paddingRight="?android:attr/scrollbarSize"

        android:baselineAligned="false" >



    <TextView android:id="@+id/license"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="15dip"

            android:layout_marginLeft="15dip"

            android:layout_marginEnd="6dip"

            android:layout_marginRight="6dip"

            android:layout_marginTop="6dip"

            android:layout_marginBottom="6dip"

            android:singleLine="true"

            android:textAppearance="?android:attr/textAppearanceMediumInverse"

            android:textColor="?android:attr/textColorPrimary"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal" />



</LinearLayout>

res/layout/license_menu_activity.xml

0 → 100644
+35 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2017 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:orientation="vertical"

              android:layout_height="match_parent"

              android:layout_width="match_parent"

              android:background="@android:color/transparent">



        <ListView android:id="@+id/license_list"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:layout_weight="1"

                android:paddingTop="0dp"

                android:paddingBottom="0dp"

                android:paddingLeft="16dp"

                android:paddingRight="16dp"

                android:scrollbarStyle="outsideOverlay"

                android:clipToPadding="false"

                android:drawSelectorOnTop="false"

                android:cacheColorHint="@android:color/transparent"

                android:scrollbarAlwaysDrawVerticalTrack="true" />

</LinearLayout>

res/layout/license_scrollview.xml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2017 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

  -->



<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/license_activity_scrollview"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



      <TextView

          android:id="@+id/license_activity_textview"

          android:layout_width="match_parent"

          android:layout_height="wrap_content"

          android:typeface="monospace"

          android:paddingStart="16dip"

          android:paddingLeft="16dip"

          android:paddingEnd="16dip"

          android:paddingRight="16dip"

          android:paddingTop="8dip"

          android:paddingBottom="8dip" />

</ScrollView>
 
 No newline at end of file

res/raw/keep.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2017 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

  -->

<resources xmlns:tools="http://schemas.android.com/tools"

    tools:keep="@raw/*"/>