Commit Graph

2349 Commits

Author SHA1 Message Date
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
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
Brian Attwell
7d383b9271 Hide ProviderStatus and Authentication APIs
Bug: 21090207
Change-Id: I27b604b9c849e1aad8289c517f5e50c5d0faae0f
2015-05-20 17:28:35 +00:00
Jorim Jaggi
8c9c5a1dfd am 0f9d3152: am 06ac707d: am c6767354: Merge "Add setting to disable assist data (1/2)" into mnc-dev
* commit '0f9d315217ebeb933f5f6b79d22e03b2c0c889ae': (30 commits)
  Add setting to disable assist data (1/2)
  Make all icon fields & extras sent to listeners backward-compatible.
  Revert "Fix IMMS#mInputShown state inconsistency."
  Fix bug with jobservice context giving wrong value
  camera2: Fix work-profile eviction handling.
  Fix missing break in Icon class
  Fix post dial for remote connections
  Fix build: udpate parser factory method
  Don't keep LayoutlibCallback reference.
  Adjust lockscreen style to spec
  [RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib.
  Change the location of Brandmaster statement file.
  Revert "Update IME focus when the active view is losing the focus."
  Revert "Icon support comes to Notification."
  Fix icon-related crash.
  Don't display the "no Internet access" prompt on captive portals.
  Rewriting should fail when any paths are null.
  Ignore abandon after install relinquished.
  Fix build - Revert "Revert "Use default constructor to get anti-aliasing""
  Fix crash in setup wizard
  ...
2015-05-19 05:14:06 +00:00
Jorim Jaggi
9d91083034 Add setting to disable assist data (1/2)
Bug: 20944446
Change-Id: I8050df3177b6d540829c3f0989a4e4b1381c87ec
2015-05-18 21:39:05 -07:00
Svet Ganov
856524f573 am 32e15104: am 9df1411c: am 4e76ee07: Merge "Fix easter egg setting validator to accept valid values" into mnc-dev
* commit '32e15104e2b0cad23fa96a881f4cab849dd92f25':
  Fix easter egg setting validator to accept valid values
2015-05-15 17:05:49 +00:00
Svet Ganov
b1918a0568 Fix easter egg setting validator to accept valid values
bug:21188928

Change-Id: I5f6d445aad7231a907026c552c87f9cdfe024d32
2015-05-15 09:33:00 -07:00
Svet Ganov
4ec301faac am 59a49c03: am a82e4878: am 67b7ec28: Merge "Access mock location is no longer a runtime permission - framework" into mnc-dev
* commit '59a49c0309e9cec01e33be07de74e3c530efa07f':
  Access mock location is no longer a runtime permission - framework
2015-05-14 01:01:09 +00:00
Svet Ganov
67b7ec2887 Merge "Access mock location is no longer a runtime permission - framework" into mnc-dev 2015-05-13 23:45:23 +00:00
Svet Ganov
f7e9cf4fb4 Access mock location is no longer a runtime permission - framework
The access mock location is no longer a runtime permission. It is a
signature protected one that apps cannot get but the fact they request
it means they want to inject location into the system. Now the user
gets to choose the current mock location app in developer options from
the apps that request the mock location permission. The access to mock
location is no longer guarded by the permisson but from a new app op
which is off by default and the settiings UI sets it to enabled only
for the currently selected mock location app.

bug:21078873

Change-Id: I19e3f9dc7c7de82eab46b30fec1abfbca54a0e59
2015-05-13 15:37:21 -07:00
Nancy Chen
514cd028ca am 3b8d8f76: am e8f1f899: am 78250907: Merge "Add phone account field for voicemail to distinguish the source." into mnc-dev
* commit '3b8d8f761a5d77b1ee85d777a75c638c38957061':
  Add phone account field for voicemail to distinguish the source.
2015-05-13 22:36:25 +00:00
Nancy Chen
782509076b Merge "Add phone account field for voicemail to distinguish the source." into mnc-dev 2015-05-13 21:54:48 +00:00
Jorim Jaggi
25c861fc42 am 8fd6d671: am 0d56be54: am 131a19ee: Merge "Persist fingerprint names" into mnc-dev
* commit '8fd6d6715558a67130f8ff6d84c4c28ef80a874d':
  Persist fingerprint names
2015-05-13 21:02:11 +00:00
Jorim Jaggi
ee77cebc1a Persist fingerprint names
Bug: 20469328
Change-Id: I8f4a988687bfb78c36cc7cf187103a9d93ed4535
2015-05-13 13:25:26 -07:00
Nancy Chen
16b84b0ab5 Add phone account field for voicemail to distinguish the source.
When inserting a voicemail, sometimes we will want to provide a phone
account so add relevant fields to voicemail object and builder.
Also added insertion logic for phone account details into
VoicemailContract.

Bug: 19990866
Change-Id: I8848cc86167a83f93248d809a6b0164f5ebf421f
2015-05-12 22:07:12 -07:00
Jason Monk
9de4cc5770 am d8ee3c77: am deb356dd: am 2df11817: Merge "Add control for double tap to wake setting" into mnc-dev
* commit 'd8ee3c770fc0619e053a5aa793938d13a354acf4':
  Add control for double tap to wake setting
2015-05-12 15:09:36 +00:00
Jason Monk
27bbb2d0a1 Add control for double tap to wake setting
Bug: 16875464
Change-Id: Ic1ad910dd38acbc68ef040b2acdf3696ec2c2e4e
2015-05-12 10:12:32 -04:00
John Spurlock
35686d9bff am 22b5f2ac: am a7b4cc0d: am d89a6b2a: Merge "Zen: Simplify notification policy api, add zenmode api." into mnc-dev
* commit '22b5f2ac11e769315fa47915217fe546e467cab5':
  Zen: Simplify notification policy api, add zenmode api.
2015-05-08 22:53:29 +00:00
John Spurlock
807749301f Zen: Simplify notification policy api, add zenmode api.
- Remove the concept of a notification policy management token
   in favor of a simple grant/deny per app.  Currently, all requests
   are immediately granted.
 - Add zen mode getter/setting, limit to apps that have been granted
   policy access.
 - Add intent for zen mode changes.
 - Public name for zen mode = "interruption filter", moved from
   NotificationListenerService to NotificationManager.
 - Add settings metadata for new DND access Settings screen.
 - Add the split sender settings for calls vs messages to the public
   Policy api.
 - This change is meant to finalize the public api, persisting
   granted app status and showing the user-visible dialog will be
   done as followups.

Bug: 18298798
Change-Id: I511be98d69939f057c0c7dc1a6dfe63d1c468193
2015-05-08 13:34:30 -04:00
Erik Kline
3629b4d65d am 3d85fcbf: am 15748d35: am a0698b61: Merge "Optionally add a default MOBILE request." into mnc-dev
* commit '3d85fcbfb01cc611697d79a18b91107ede563767':
  Optionally add a default MOBILE request.
2015-05-08 16:58:21 +00:00
Erik Kline
da4bfa81cd Optionally add a default MOBILE request.
This enables persisting the mobile internet data connection, even
when Wi-Fi is enabled and serving as the default network (for faster
network switching).

Change-Id: I9d1512b3a8413c4f163c63d57e66bded017101e4
2015-05-08 15:22:37 +09:00