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

Commit 623f3785 authored by Matthew Fritze's avatar Matthew Fritze Committed by Android (Google) Code Review
Browse files

Merge "Add NFC Settings Panel API"

parents f0a17d6b f8a1ff15

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -38749,6 +38749,7 @@ package android.provider { 














  public static final class Settings.Panel {















    field public static final String ACTION_INTERNET_CONNECTIVITY = "android.settings.panel.action.INTERNET_CONNECTIVITY";













    field public static final String ACTION_NFC = "android.settings.panel.action.NFC";















    field public static final String ACTION_VOLUME = "android.settings.panel.action.VOLUME";















  }







































core/java/android/provider/Settings.java



+11
−0




























Original line number
Diff line number
Diff line








@@ -14602,6 +14602,17 @@ public final class Settings {













        public static final String ACTION_INTERNET_CONNECTIVITY =















                "android.settings.panel.action.INTERNET_CONNECTIVITY";



























        /**













         * Activity Action: Show a settings dialog containing NFC-related settings.













         * <p>













         * Input: Nothing.













         * <p>













         * Output: Nothing.













         */













        @SdkConstant(SdkConstant.SdkConstantType.ACTIVITY_INTENT_ACTION)













        public static final String ACTION_NFC =













                "android.settings.panel.action.NFC";



























        /**















         * Activity Action: Show a settings dialog containing all volume streams.















         * <p>