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

Commit da5221eb authored by DvTonder's avatar DvTonder Committed by Gerrit Code Review
Browse files

Merge "Settings: Add android namespace prefix" into cm-10.2

parents 4aed253d f03c6984

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -98,7 +98,8 @@ 
            android:requiredForAllUsers="true"

            android:supportsRtl="true">



        <uses-library android:name="org.cyanogenmod.hardware" required="false" />

        <uses-library android:name="org.cyanogenmod.hardware"

            android:required="false" />



        <receiver android:name=".cyanogenmod.LockscreenInterface$DeviceAdminLockscreenReceiver"

            android:permission="android.permission.BIND_DEVICE_ADMIN">

src/com/android/settings/cyanogenmod/ShortcutPickHelper.java

+0 −1
Original line number Diff line number Diff line
@@ -224,7 +224,6 @@ public class ShortcutPickHelper { 
            }

        }





        public View getChildView(int groupPosition, int childPosition, boolean isLastChild,

                View convertView, ViewGroup parent) {

            if (convertView == null) {