Commit Graph

2368 Commits

Author SHA1 Message Date
Tomasz Mikolajewski
58461ebdef am 87a45380: am 456778ff: am 9ce9ffec: Merge "Allow to customize title of the dialog." into mnc-dev
* commit '87a4538034d41964ed81b69749939c1868505847':
  Allow to customize title of the dialog.
2015-06-18 00:31:20 +00:00
Tomasz Mikolajewski
9ce9ffec9e Merge "Allow to customize title of the dialog." into mnc-dev 2015-06-17 23:51:07 +00:00
Dianne Hackborn
22afc5469e am 2133afc7: am d21b695f: am 22433a33: Merge "Fix issue #21814207 and issue #21814212 (alarm manager)" into mnc-dev
* commit '2133afc77aa36f186b9e5c0ff9954d0d26848e3e':
  Fix issue #21814207 and issue #21814212 (alarm manager)
2015-06-17 23:27:55 +00:00
Tomasz Mikolajewski
0e591f95bd Allow to customize title of the dialog.
TEST=adb shell am start -a android.intent.action.OPEN_DOCUMENT -e
     android.intent.extra.TITLE 'Upload!' -t "text/plain"
BUG=19150996

Change-Id: Ibded6cfaa2de3698c5eada154efbee2b323464d4
2015-06-17 16:12:14 -07:00
Dianne Hackborn
a750a63d63 Fix issue #21814207 and issue #21814212 (alarm manager)
Issue #21814207: AlarmManager.setAndAllowWhileIdle should also allow wake locks.

Introduce a whole new infrastructure for providing options when
sending broadcasts, much like ActivityOptions.  There is a single
option right now, asking the activity manager to apply a tempory
whitelist to each receiver of the broadcast.

Issue #21814212: Need to allow configuration of alarm manager parameters

The various alarm manager timing configurations are not modifiable
through settings, much like DeviceIdleController.  Also did a few
tweaks in the existing DeviceIdleController impl.

Change-Id: Ifd01013185acc4de668617b1e46e78e30ebed041
2015-06-17 11:41:45 -07:00
Junda Liu
ca0ff76539 am 603bf00f: am 25acdffa: am a11ffa64: Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev
* commit '603bf00fcba0e95ed42cd4b9eadd1bfc1b45b28a':
  Remove hide_carrier_network_settings from Settings.
2015-06-16 23:45:09 +00:00
Junda Liu
a11ffa6436 Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev 2015-06-16 23:11:32 +00:00
Junda Liu
297da6ffb9 Remove hide_carrier_network_settings from Settings.
No longer needs this as carrier config manager handles it now.

Bug: b/21347654
Change-Id: I26d34cde0d31ae53a6e5a25cd555ed2ff7600f38
2015-06-15 15:29:08 -07:00
Dianne Hackborn
1317a6585c am d5111d46: am 4169b628: am 285cb414: Merge "Fix issue #21813831: Need API for asking to be added to power whitelist" into mnc-dev
* commit 'd5111d46d6589921c3ad3d7ee6771ccc0e257f8f':
  Fix issue #21813831: Need API for asking to be added to power whitelist
2015-06-15 19:49:46 +00:00
Dianne Hackborn
1958e5e787 Fix issue #21813831: Need API for asking to be added to power whitelist
Add the API.  Clean up a few related things.

Change-Id: I190adad1812f36f6095b98a1001fedb94874e8b5
2015-06-15 11:53:59 -07:00
Svetoslav
f8d6ce6aab am 13fb3353: am 281c8389: am 6d977832: Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev
* commit '13fb33535f93c8cd49650b398f5728938f90933b':
  Remove bookmarks provider and associated permissions - framework
2015-06-14 20:34:52 +00:00
Svetoslav
6d9778328a Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev 2015-06-14 20:01:02 +00:00
Adam Lesinski
7efeb10f6f am f667a062: am 30ad8de5: am cd9d7b7b: Merge "App Standby: Convert constants to Settings.Global" into mnc-dev
* commit 'f667a062e91e0312af1267ee08a6ce9472510379':
  App Standby: Convert constants to Settings.Global
2015-06-12 23:52:34 +00:00
Adam Lesinski
a6232df053 App Standby: Convert constants to Settings.Global
Use settings instead of hardcoded constants, and listen for their changes.

Bug:21640379
Change-Id: Id8305bb234f93f7c64c1a5e82e26b31504624324
2015-06-12 16:19:07 -07:00
Svetoslav
bfa216ac26 Remove bookmarks provider and associated permissions - framework
Change-Id: I7f5a2f14a12da473f05a5075d98e762f8f8ed970
2015-06-11 18:59:25 -07:00
Adam Lesinski
64bf0f000c am 3189d8db: am 6643da95: am df85c12b: Merge "Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants" into mnc-dev
* commit '3189d8db75128142d1a8651ca60e9304fb214057':
  Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants
2015-06-11 21:25:01 +00:00
Zheng Fu
dfd93c69c0 Merge "Revert contact metadata_sync constants." into mnc-dev 2015-06-11 20:24:59 +00:00
Adam Lesinski
31c05d1361 Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants
This will allow gservices to tweak the settings and experiment
with different values for various doze constants.

The values are encoded in a string as a key=value list. Ex:

inactive_to=5000,idle_factor=0.01

Bug:21640379
Change-Id: Ie98a0e4893f9b46a64d961d6c5c5169b8b8ad742
2015-06-11 12:30:47 -07:00
Jason Monk
ceebac31ce am 4ef0beb6: am 5bda8f4e: am 253ee76d: Merge "Add action for reaching ignore battery optimizations" into mnc-dev
* commit '4ef0beb6ae3a7671845454b833d7046fcb23283e':
  Add action for reaching ignore battery optimizations
2015-06-11 01:31:39 +00:00
Ben Kwa
cf1e2f03df resolved conflicts for merge of 3aff4fc6 to master
Change-Id: Id816d859f929de3bd0328ef3a67e2bef9fadf28b
2015-06-10 18:22:10 -07:00
Zheng Fu
1ed7319995 Revert contact metadata_sync constants.
Bug:20553119
Change-Id: Ib6cb620a4b9b72af267423feb6d5c2e5961edf49
2015-06-10 14:27:50 -07:00
Jason Monk
287b889f93 Add action for reaching ignore battery optimizations
Bug: 21375688
Change-Id: I1477192371aae2f3497fd49ad704de183ed836a3
2015-06-10 15:38:47 -04:00
Ben Kwa
c783a5e762 Merge "Enable apps to exclude their own roots from the DocumentsUI roots list." into mnc-dev 2015-06-10 18:30:31 +00:00
Ben Kwa
77797400ec Enable apps to exclude their own roots from the DocumentsUI roots list.
- Add DocumentsContract.EXTRA_EXCLUDE_SELF (boolean extra)
- Add code to DocumentsActivity to cache the providers of the calling
  app if EXTRA_EXCLUDE_SELF is set on incoming Intents.
- Add code to RootsCache to exclude roots from the calling app.
- Add code to allow only system apps to use EXTRA_PACKAGE_NAME.

Change-Id: Ia7cc2a1a297676c7b26f6e583042a4607d8c9a4e
2015-06-10 11:24:55 -07:00
Zheng Fu
50ef8f5eb6 Merge "un-hide raw_contacts.backup_id and expose metadatasync to system." 2015-06-10 00:06:04 +00:00
Zheng Fu
7997bee366 un-hide raw_contacts.backup_id and expose metadatasync to system.
Bug:18930508
Change-Id: I37eb7ca41416becb549ebe5b1986925952a943c9
2015-06-09 16:50:02 -07:00
Xiyuan Xia
d880c4bc1e am c7a1d5d6: am 000d5339: am 12149b69: Merge "Add setting for assistant" into mnc-dev
* commit 'c7a1d5d6e23f1cc0fbe2fb277395792cd6ee1657':
  Add setting for assistant
2015-06-09 23:22:57 +00:00
Xiyuan Xia
e6de8b9ad4 Add setting for assistant
- Add assistant setting in Settings.Secure;
- If the assistant setting is missing, start assistant as current behavior;
- If the setting is present, start assistant use the setting value;

Bug:20210110
Change-Id: I946fbb504452e445879ad688130a1570b857b9c5
2015-06-09 14:21:38 -07:00
Etan Cohen
1c4de6a1a4 am dd8ed093: am 03609df3: am 76316977: Merge "Update documentation of CARRIER_PRESENCE & bitmasks." into mnc-dev
* commit 'dd8ed09397cb3bcbc89b1864543854dc027c68c8':
  Update documentation of CARRIER_PRESENCE & bitmasks.
2015-06-08 21:09:14 +00:00
Etan Cohen
e4dc7e1ac3 Update documentation of CARRIER_PRESENCE & bitmasks.
Bug: 21572292
Change-Id: If4727e7c18ce94f7c715ac91d61456ff0de10001
2015-06-08 13:02:44 -07:00
John Spurlock
8a3188e8ea am 202dea41: am 5e73a085: am 20ac61b8: Merge "Zen: New user flow for requesting DND access." into mnc-dev
* commit '202dea4125f189e242da71c1378699321882671b':
  Zen: New user flow for requesting DND access.
2015-06-08 18:38:15 +00:00
John Spurlock
20ac61b8c0 Merge "Zen: New user flow for requesting DND access." into mnc-dev 2015-06-08 16:39:36 +00:00
John Spurlock
7c74f78a85 Zen: New user flow for requesting DND access.
- User flow is now similar to requesting access to notification
   content, namely prompting the user to visit a settings page
   for enabling/disabling apps access.
 - New ACTION_NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED intent
   for apps to listen to this state change.
 - Removed obsolete request method and associated internal callback
   aidl.
 - Added new android.permission.ACCESS_NOTIFICATION_POLICY permission
   for apps to include as a signal that they want to request this access
   (and therefore appear in the list on the settings page).
 - Improve javadocs, outline the user flow in NotificationManager#isNotificationPolicyAccessGranted
   and link to this method elsewhere.
 - NoManService now persists the user-enabled package list across reboots
   and does so per-user.
 - Rename public settings intent to correspond with the noman api.

Bug: 21621663
Change-Id: I72cbc21cd736e6a157b6be5d1d0ba0b4a8e7ef4e
2015-06-08 11:53:35 -04:00
Johnson Hsieh
7339bbaca0 am 38e36f12: am 81188176: am 997f3cca: Merge "Fix build: documentation error in AlarmClock.java." into mnc-dev
* commit '38e36f1210296bc799d3b3800f5c64691898c3da':
  Fix build: documentation error in AlarmClock.java.
2015-06-05 03:30:36 +00:00
Johnson Hsieh
bcc1ff6726 Fix build: documentation error in AlarmClock.java.
Change-Id: I3f64df1857c516d4c6a4ed56094a27f489eddef3
2015-06-04 19:51:52 -07:00
Johnson Hsieh
1ddd35c454 am 01f77af0: am 37750c28: am 6c72febd: Merge "Updates AlarmClock intent API." into mnc-dev
* commit '01f77af0480a07e1a6420d9d9d7efaa52b5a933d':
  Updates AlarmClock intent API.
2015-06-05 00:49:01 +00:00
Johnson Hsieh
1ef714a284 Updates AlarmClock intent API.
Changes to the AlarmClock intent API based on feedback from Alarm team:

1. s/VOICE_CANCEL_ALARM/DISMISS_ALARM/g - "Cancel" is a bit unclear, so we're
changing it to "dismiss". Also, remove "VOICE_" since we should also add
support for this in multi-modal.

2. Removed DELETE_ALARM - we will likely not complete this for Android M.

3. Removed ALARM_SEARCH_MODE_NONE = "none". Instead, if
EXTRA_ALARM_SEARCH_MODE is missing (and alarm data URI is not given), then:
* If exactly one active alarm exists, it is dismissed.
* If more than one active alarm exists, the user is prompted to choose
  the alarm to dismiss.

4. Add ALARM_SEARCH_MODE_LABEL, which allows searching for alarms by a
(partially) matching label.

5. Add SNOOZE_ALARM for snoozing an alarm, with optional
extra EXTRA_ALARM_SNOOZE_DURATION.

Change-Id: I39502532e54d5f0fe51a8545a4c586615f5e5e89
2015-06-04 10:43:19 -07:00
Jorim Jaggi
4bb01f1b11 am ecfeefb4: am f7f90276: am 7d01d2c6: Merge "Fix API review: Camera prewarm" into mnc-dev
* commit 'ecfeefb483a7a7ab33aae22ae85ccbdaa3a68522':
  Fix API review: Camera prewarm
  lock device orientation during app compatibility test
  Fix reconfigure & setPremult alpha handling
  Unflip TextureView getBitmap readback
  Handle error states when refreshing accessibility node
2015-06-02 23:05:36 +00:00
Jorim Jaggi
7d01d2c6cf Merge "Fix API review: Camera prewarm" into mnc-dev 2015-06-02 22:25:29 +00:00
Brian Attwell
df336c9064 am 6b37b0df: am 03c818b5: am b36ad5dc: Decouple ProviderStatus & internal provider state
* commit '6b37b0df1102f0f7f3336638a68defba197d1910':
  Decouple ProviderStatus & internal provider state
2015-06-02 21:27:59 +00:00
Brian Attwell
b36ad5dc6b Decouple ProviderStatus & internal provider state
Bug: 21090207
Change-Id: I7e93e36ad0c0d667ac56983c76acb1b97bd8755c
2015-06-02 20:56:27 +00:00
Jorim Jaggi
d944986fbd Fix API review: Camera prewarm
Let the intent receiver of a camea launch intent declare a prewarm
service instead of sending broadcasts.

Bug: 21347653
Change-Id: I11e31aad4f788ad90eb46a661b819d3e808ddb51
2015-06-01 18:01:20 -07:00
Nancy Chen
e9a4545d06 am 8f1f3153: am ff29b964: am f279341a: Merge "Update docstrings for VoicemailContract to be more descriptive." into mnc-dev
* commit '8f1f3153af0463e8898ab4e24a379b42cd56ed36':
  Update docstrings for VoicemailContract to be more descriptive.
2015-05-28 00:37:43 +00:00
Nancy Chen
a042e6c74e Update docstrings for VoicemailContract to be more descriptive.
Bug: 21343781
Change-Id: I221f61d4e9306a92c736a12b2cff3d9fccebdc47
2015-05-27 15:54:55 -07:00
Nancy Chen
f6431d841e am d12eb353: am 3dd59bfb: am 769832d1: Merge "Fix phone account component name for voicemail status entries." into mnc-dev
* commit 'd12eb3531c38c8e222c386ec988df7359c81bf01':
  Fix phone account component name for voicemail status entries.
2015-05-21 22:40:39 +00:00
Nancy Chen
769832d111 Merge "Fix phone account component name for voicemail status entries." into mnc-dev 2015-05-21 22:01:34 +00:00
Nancy Chen
4924a31b18 Fix phone account component name for voicemail status entries.
Currently was using toString(), switch to "flattenToString" so it is
consistent with the call log.

Bug: 20954214

Change-Id: Ia9ed67bf463e4a2d4d9a02e00243d49238be17fe
2015-05-21 13:05:41 -07:00
Etan Cohen
e85a3e5458 am 33a95f93: am 14c60bb1: am 466503d0: Merge "Add Carrier Presence to CP2: Phone" into mnc-dev
* commit '33a95f93ca4856032eef804cfe97a798c6df6748':
  Add Carrier Presence to CP2: Phone
2015-05-20 22:30:20 +00:00
Etan Cohen
466503d0bd Merge "Add Carrier Presence to CP2: Phone" into mnc-dev 2015-05-20 21:38:07 +00:00
Brian Attwell
05ee17b973 am 258a6b62: am afe2b09c: am 7d383b92: Hide ProviderStatus and Authentication APIs
* commit '258a6b62e6d41e502a85c4753b93a91be5333fb4':
  Hide ProviderStatus and Authentication APIs
2015-05-20 18:09:20 +00:00