Commit Graph

2335 Commits

Author SHA1 Message Date
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
Jeff Brown
4cf355d209 am 37d66f3b: am 8d605030: am ee2e8fbe: Merge changes from topic \'mr\' into mnc-dev
* commit '37d66f3bccdde61517308b8d034484abbe82c36b':
  Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
  Revert "Initial draft of new MediaRouter APIs."
2015-05-07 05:42:06 +00:00
John Spurlock
486ebed8a4 am b5eeb1ce: am 3fa46d4e: am c2ec3340: Merge "Add setting to mute wireless charging sound." into mnc-dev
* commit 'b5eeb1cec3fee63c6720c9e0c839aae1693270cd':
  Add setting to mute wireless charging sound.
2015-05-07 05:40:54 +00:00
Jeff Brown
4244ce6a17 Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
Bug: 20641986
Change-Id: I137dfc7ef41bdda2ce3e81c164767319c88159f1
2015-05-06 16:02:22 -07:00
Jeff Brown
c05c1aeedf Revert "Initial draft of new MediaRouter APIs."
This reverts commit 1a937b04e6.

Bug: 20641986
Change-Id: I035d945d1561e5fc7c914aa9362635f763c83cfd
2015-05-06 16:02:21 -07:00
John Spurlock
51a871d48a Add setting to mute wireless charging sound.
Bug: 19538553
Change-Id: I1af971b35ae9eeb38d8ec38c57b22152095e2725
2015-05-06 18:22:40 -04:00
Tingting Wang
03583a4ee3 Add metadata_dirty column to ContactsContract.
Add metadata_dirty column to RawContacts table, to indicate
metadata related info has been changed.

BUG 20827851

Change-Id: I45ba90bb44f1d3e66b45facd9a643fc77e876e8a
2015-05-04 16:34:58 -07:00
Etan Cohen
534a65d3b6 Add Carrier Presence to CP2: Phone
Carrier Presence (RCS-based) is required for IMS-based telephony
services: VoLTE, WFC, and VT (Video Telephony). Public API in the
form of Presence column is added to Phone. Initial bit-field is
defined for for VT capability.

Change-Id: Ice78f895acf89a91f7478115e64caeb8d26f5456
2015-05-04 15:44:08 -07:00
Zheng Fu
096a75eb77 Merge "Add constants for ContactMetadataProvider." 2015-04-30 21:23:13 +00:00
John Spurlock
d60258f2d3 Zen: New event condition data model.
- Add system condition provider for calendar event-based rules.
 - Add stub condition provider for handling event conditions.
 - Add various shared items to support new settings subpage.

Bug: 20064962
Change-Id: I6f5afe0f1444976f0dc6807048e0580e8a28070e
2015-04-30 11:42:11 -04:00
Tor Norbye
52881c8631 Add permission annotations to the Browser
Change-Id: Ib75a846faa4f73468d4c7bc04092ec0e80414d67
2015-04-23 18:49:23 -07:00
Zheng Fu
c37ba12c9b Add constants for ContactMetadataProvider.
Bug:20537162
Change-Id: I3febd47a16a440466b0bafe3cec17a6dfa1535e7
2015-04-23 16:46:45 -07:00
Yorke Lee
6446d97942 Merge "Add hidden class in framework for managing the default dialer settings" 2015-04-23 17:23:41 +00:00
Yorke Lee
014de02dd2 Add hidden class in framework for managing the default dialer settings
Bug: 20303635
Change-Id: I7e7318086ade9531fb85f08b8e3f1f001ee0a8d9
2015-04-23 10:19:52 -07:00
Jason Monk
6f909783e9 Add constants for usage access settings
Bug: 20290386
Change-Id: I216ad25b94de739449941a8b4e965329fe324f66
2015-04-23 10:07:56 -04:00