Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Remove dynamic location settings footer"" into sc-dev am: 83a305a089 am: f0814d24f6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14443641

Change-Id: I1739bf52a8941de74e5acd1581615a72df626a6d
This commit is contained in:
Yu-Han Yang
2021-05-08 16:35:26 +00:00
committed by Automerger Merge Worker
parent e4d8c138b0 f0814d24f6
commit 9adac450c0
1 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
location/java/android/location/LocationManager.java
View File

@@ -346,6 +346,43 @@ public class LocationManager {
*/ */
public static final String EXTRA_GNSS_CAPABILITIES = "android.location.extra.GNSS_CAPABILITIES"; public static final String EXTRA_GNSS_CAPABILITIES = "android.location.extra.GNSS_CAPABILITIES";
/**
* Broadcast intent action for Settings app to inject a footer at the bottom of location
* settings. This is for use only by apps that are included in the system image.
*
* <p>To inject a footer to location settings, you must declare a broadcast receiver for
* this action in the manifest:
* <pre>
* &lt;receiver android:name="com.example.android.footer.MyFooterInjector"&gt;
* &lt;intent-filter&gt;
* &lt;action android:name="com.android.settings.location.INJECT_FOOTER" /&gt;
* &lt;/intent-filter&gt;
* &lt;meta-data
* android:name="com.android.settings.location.FOOTER_STRING"
* android:resource="@string/my_injected_footer_string" /&gt;
* &lt;/receiver&gt;
* </pre>
*
* <p>This broadcast receiver will never actually be invoked. See also
* {#METADATA_SETTINGS_FOOTER_STRING}.
*
* @hide
*/
public static final String SETTINGS_FOOTER_DISPLAYED_ACTION =
"com.android.settings.location.DISPLAYED_FOOTER";
/**
* Metadata name for {@link LocationManager#SETTINGS_FOOTER_DISPLAYED_ACTION} broadcast
* receivers to specify a string resource id as location settings footer text. This is for use
* only by apps that are included in the system image.
*
* <p>See {@link #SETTINGS_FOOTER_DISPLAYED_ACTION} for more detail on how to use.
*
* @hide
*/
public static final String METADATA_SETTINGS_FOOTER_STRING =
"com.android.settings.location.FOOTER_STRING";
private static final long MAX_SINGLE_LOCATION_TIMEOUT_MS = 30 * 1000; private static final long MAX_SINGLE_LOCATION_TIMEOUT_MS = 30 * 1000;
private static final String CACHE_KEY_LOCATION_ENABLED_PROPERTY = private static final String CACHE_KEY_LOCATION_ENABLED_PROPERTY =