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

Commit 0fbc8957 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Removing some unnecessary packages, to simplify AndroidStudio setup"

parents 00220617 f1ea4f0e

packages/SettingsLib/ActionBarShadow/AndroidManifest.xml

+0 −2
Original line number Diff line number Diff line
@@ -18,6 +18,4 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.settingslib.widget">



    <uses-sdk android:minSdkVersion="21" />



</manifest>

packages/SettingsLib/AndroidManifest.xml

+0 −3
Original line number Diff line number Diff line
@@ -18,7 +18,4 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.settingslib">



    <uses-sdk

        android:minSdkVersion="21" />



</manifest>

packages/SettingsLib/AppPreference/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
  -->



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

          package="com.android.settingslib.widget.apppreference">

          package="com.android.settingslib.widget">



    <uses-sdk android:minSdkVersion="21" />

packages/SettingsLib/AppPreference/src/com/android/settingslib/widget/apppreference/AppPreference.java

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ import android.widget.ProgressBar; 
import androidx.preference.Preference;

import androidx.preference.PreferenceViewHolder;



import com.android.settingslib.widget.R;



public class AppPreference extends Preference {



    private int mProgress;

packages/SettingsLib/HelpUtils/AndroidManifest.xml

+0 −2
Original line number Diff line number Diff line
@@ -18,6 +18,4 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.settingslib.helputils">



    <uses-sdk android:minSdkVersion="21" />



</manifest>