Commit Graph

7885 Commits

Author SHA1 Message Date
Sailesh Nepal
909d1b5755 resolved conflicts for merge of 03e88771 to master
Change-Id: If55838968d008043f85a3cda1a2e0f76f357aec3
2014-07-17 11:05:42 -07:00
Shishir Agrawal
169e888524 am 38c365d0: Merge "Unhiding the SMS/MMS APIs for injection/transport." into lmp-dev
* commit '38c365d037e40385f2b25cd0fe0214c24f2f08ed':
  Unhiding the SMS/MMS APIs for injection/transport.
2014-07-17 16:45:14 +00:00
Barnaby James
48f3552093 Add intents for setting airplane and zen mode by voice only.
Change-Id: I28a262da86eb102d1bd12265f96db0efec5db203
2014-07-17 07:24:09 -07:00
RoboErik
1a50e1db0e am 22ea3c3d: am b21fab77: Merge "Change adjustVolumeBy to adjustVolume" into lmp-dev
* commit '22ea3c3ddaad1b25c05c3e6e6027747076d44750':
  Change adjustVolumeBy to adjustVolume
2014-07-17 14:13:02 +00:00
RoboErik
e1ecd82cbb am 1cd008e1: am 9b039cf8: Merge "Make MediaSession and MediaController constructors public" into lmp-dev
* commit '1cd008e1fe13b97068c3eac86b1b78ab20dca1fb':
  Make MediaSession and MediaController constructors public
2014-07-17 14:12:53 +00:00
Niels Egberts
6c472fe969 TtsSpan builders for each TtsSpan type.
The reason for separate classes for each type, instead of a more flat
structure is to enable easy discovery of the available arguments that
can be set. For L we'll have about 12 types with 30 arguments and
almost all of the arguments are type specific. In future releases
we'll introduce more arguments. With editors that have code completion
one can construct a span without having to consult the documentation.

For now it only contains Text and Cardinal types.

Change-Id: I94531e600133d9f4f59a4170cceef1ee7a360ca7
2014-07-17 12:19:42 +01:00
Sailesh Nepal
001bbbb239 TTY: frameworks/base changes
This CL makes the following changes:
  1. New public APIs:
    - TelecommManager.getCurrentTtyMode: This is used to
      get current TTY mode. It's used by Telephony to set
      the phone state before calls are created (which is why
      it can't be a Conneciton API).
    - TelecommConstants.TTY_MODE_*: These are constants
      copied from Phone.java
    - TelecommConstants.ACTION_CURRENT_TTY_MODE_CHANGED: This
      action is fired when the current TTY mode changes.
      Apps can listen to this before and during a call.
      The old version of this was in TtyIntent.java which
      I deleted.

  2. New private API
    - TelecommManager.isTtySupported: This is used by
      Telephony to hide the TTY settings on devices
      that don't support TTY

  3. Various updates to use the constants renamed in this CL

Change-Id: I652b095af30cc2732a06829dc23492e5355660da
2014-07-16 21:14:58 +00:00
RoboErik
ac17c2a8c9 Merge "Change adjustVolumeBy to adjustVolume" into lmp-dev 2014-07-16 16:25:13 +00:00
RoboErik
1ff5b1648a Change adjustVolumeBy to adjustVolume
This makes volume adjustments take a direction instead of a number of
steps and renames the API appropriately.

Change-Id: I6a31cbc42d889a38aa63446686a424cb2b8b2270
2014-07-16 12:03:45 -07:00
RoboErik
8b4bffcac9 Make MediaSession and MediaController constructors public
This makes the MediaSession/Controller constructors public and registers
with the system behind the scenes.

This also adds a bit about needing to call setActive(true) to start receiving
commands in MediaSession's docs.

Change-Id: If882d229b54c36bf0831aca0255052dda667a2bc
2014-07-16 12:03:45 -07:00
Jean-Michel Trivi
8663345733 am 1a0cbfe3: am a880e639: Merge "MediaPlayer factory method with audio attributes and session ID" into lmp-dev
* commit '1a0cbfe3dcc602e0fb2bc624dbd9c0eb545aa604':
  MediaPlayer factory method with audio attributes and session ID
2014-07-16 19:03:44 +00:00
Jae Seo
fba5bbf504 am e17da5d2: am ab39b29c: Merge "Implement TvContentRating" into lmp-dev
* commit 'e17da5d2729196f326f972236a57449af0e79f6b':
  Implement TvContentRating
2014-07-16 18:16:04 +00:00
Andrew Lee
4bad1bec24 am b1b54dcb: am 30004856: Merge "Adding getVideoState method to Telecomm Call\'s details." into lmp-dev
* commit 'b1b54dcb7e0f694aab3b871943759ca48bd368e5':
  Adding getVideoState method to Telecomm Call's details.
2014-07-16 18:11:37 +00:00
Derek Tan
4baadcae27 am b4a81d8a: am d47c2729: Merge "Remove @hide annotations from important carrier privileged APIs." into lmp-dev
* commit 'b4a81d8a6b9dfc88a66873425918e27710cfd6f0':
  Remove @hide annotations from important carrier privileged APIs.
2014-07-16 17:19:33 +00:00
Jeff Sharkey
faee1741db am 97308915: am 5ddccbd2: Merge "Add code cache directory for apps." into lmp-dev
* commit '9730891509b0c7bb50b0b2ecf498c3b993dcef39':
  Add code cache directory for apps.
2014-07-16 17:04:05 +00:00
Derek Tan
0ab985092b Merge "Remove @hide annotations from important carrier privileged APIs." into lmp-dev 2014-07-16 16:25:13 +00:00
Derek Tan
06b41ea23f Remove @hide annotations from important carrier privileged APIs.
Most of these APIs are protected by MODIFY_PHONE_STATE or carrier
privilege. Some APIs are protected by READ_PHONE_STATE.

Change-Id: Ifa04b5fb6d4bb5f21af7f728bee7dcbf77c8583b
2014-07-16 09:32:57 -07:00
Jeff Sharkey
d0a2de06a7 Merge "Add code cache directory for apps." into lmp-dev 2014-07-16 16:25:13 +00:00
Jean-Michel Trivi
e9fdeaaa74 am e3033232: am a8b0cf1d: Unhide MediaPlayer.setAudioAttributes(), javadoc clarifications
* commit 'e3033232311395bf23ee25b8308992ce5aa2df28':
  Unhide MediaPlayer.setAudioAttributes(), javadoc clarifications
2014-07-16 14:52:55 +00:00
Jean-Michel Trivi
79f5cd1429 Unhide MediaPlayer.setAudioAttributes(), javadoc clarifications
Unhide MediaPlayer.setAudioAttributes() method.

Update javadoc to explicitly state that the factory methods
  do not let you set the audio stream type, attributes or session.

Change-Id: I0d097c314db010698b035349befe0659ab4d1dde
2014-07-16 14:41:06 +00:00
Adam Connors
0e96eac397 am bdb9e425: am 7250f656: Merge "Revert "Remove enableSystemApp methods."" into lmp-dev
* commit 'bdb9e425cf90fb05a8d19a4ebdf8454ec7a40655':
  Revert "Remove enableSystemApp methods."
2014-07-16 14:24:33 +00:00
RoboErik
71940885f2 Merge "Make MediaSession and MediaController constructors public" into lmp-dev 2014-07-16 13:12:22 +00:00
Marcin Kosiba
45a3f4b1fc am a9dcfe0e: am 11231acb: Merge "Add more params to WebViewClient.shouldInterceptRequest." into lmp-dev
* commit 'a9dcfe0e9ea0ae92989c2eb599814cadaafa4a9e':
  Add more params to WebViewClient.shouldInterceptRequest.
2014-07-16 12:59:37 +00:00
Jeff Sharkey
4ed745d359 Add code cache directory for apps.
This provides a directory where apps can cache compiled or optimized
code generated at runtime.  The platform will delete all files in
this location on both app and platform upgrade.

Bug: 16187224
Change-Id: I641b21d841c436247f35ff235317e3a4ba520441
2014-07-15 22:13:26 -07:00
Lajos Molnar
0a6e4a411c am 1b952232: am 5b25d17c: Merge "MediaCodec: add reset() + documentation fixes" into lmp-dev
* commit '1b9522323df33c88bd9719c8ef3036e9b8fe2c2d':
  MediaCodec: add reset() + documentation fixes
2014-07-16 03:23:18 +00:00
Jeff Sharkey
2c509a774d am beb50dd9: am 5417dd75: Merge "Parse more split APK manifest details." into lmp-dev
* commit 'beb50dd93279b18ebc07827b96a6a406da107af1':
  Parse more split APK manifest details.
2014-07-16 03:00:27 +00:00
Shishir Agrawal
ed9c3a4a1f Unhiding the SMS/MMS APIs for injection/transport.
Change-Id: I9e634c8f1c42738465825e767bc7ef3c4778eb30
2014-07-16 13:21:43 -07:00
Jean-Michel Trivi
d70ad7a128 MediaPlayer factory method with audio attributes and session ID
Change-Id: I4e7f633c84c90581e849af2865f5be84a026f32f
2014-07-16 18:36:20 +00:00
Jeff Sharkey
da96e137bc Parse more split APK manifest details.
Allow split APKs to define activities, services, receivers,
providers, and metadata.  However, support for many manifest items
are explicitly omitted.

Only dexopt split APKs that include code.

Bug: 14975160
Change-Id: I2fbf99e2a62328aa2185e5924755af33060282fc
2014-07-15 18:50:00 -07:00
Adam Connors
655be2a98e Revert "Remove enableSystemApp methods."
We need to go back to uninstalling system apps so we can
re-install non-default system applications through Play.

This reverts commit e3dbcd138c07f2d32ac84229d0a49052cc18d424.

Change-Id: I0a7af094614c4a10800971c82e10571f7312e079
2014-07-16 09:48:43 +00:00
Amith Yamasani
2502d23ade am 8f1d6eeb: am 6053e05a: Merge "App restrictions schema and parser" into lmp-dev
* commit '8f1d6eebaa8dd7c30b3ee318211aacb06603bc0d':
  App restrictions schema and parser
2014-07-16 00:42:08 +00:00
Yorke Lee
972723a5b9 am f1da34a8: am ec9ccc17: Merge "Fix current.txt build break" into lmp-dev
* commit 'f1da34a8242724a330939cd93957db4ae58e467c':
  Fix current.txt build break
2014-07-15 22:22:36 +00:00
Fabrice Di Meglio
74fa6b7e6b am f4977d53: am c9591581: Update DatePicker widget and its related dialog
* commit 'f4977d536d5331d2e0e60d6000a0ac904a83b27b':
  Update DatePicker widget and its related dialog
2014-07-15 22:04:31 +00:00
Andrew Lee
8cf75ab35a am cdca7b1a: am 02986e35: Merge "Add VideoState member variable to InCallCall." into lmp-dev
* commit 'cdca7b1acd77145522c373f38e890d85e4044904':
  Add VideoState member variable to InCallCall.
2014-07-15 22:03:03 +00:00
Marcin Kosiba
d72e7ba1c0 Add more params to WebViewClient.shouldInterceptRequest.
This changes shouldInterceptRequest to take an object containing the
following new parameters: isMainFrame, hasUserGesture, method, headers.
This also lets the embedder specify the following additional properties
of the response: status code, response phrase, headers.

BUG: 7589347
Change-Id: Id922c5e7023eb067db871e6f782f599492a2428f
2014-07-15 21:31:44 -07:00
Lajos Molnar
e66de8f358 Merge "MediaCodec: add reset() + documentation fixes" into lmp-dev 2014-07-15 20:46:43 +00:00
Lajos Molnar
1e6e8018a4 MediaCodec: add reset() + documentation fixes
Bug: 12034929
Change-Id: I38f89a2e4c41e0ceb3fdae4522b9c04f6c43a4f1
2014-07-15 18:14:04 -07:00
Jae Seo
54892c8b81 Merge "Implement TvContentRating" into lmp-dev 2014-07-15 20:35:01 +00:00
Sungsoo Lim
e16873467c Implement TvContentRating
Added a class that represents TV content ratings that are used for
parental controls. TV input services are required to create
TvContentRating objects with rating/sub-rating constants for specific
countries (for now US and KR only) defined in this class and then
convert them into strings in order to store them in the EPG database.

Bug: 13172379
Change-Id: I6200cb12fbc274dd0a8bcb87a8ac3cd2d96791db
2014-07-15 22:11:21 -07:00
Andrew Lee
7a34138586 Adding getVideoState method to Telecomm Call's details.
Bug: 16013878
Change-Id: I07b219c0952543b7c27694ae06f0eb468a17f1ee
2014-07-16 10:14:54 -07:00
Yorke Lee
701cc88ed7 Fix current.txt build break
Change-Id: I6730b708b134827ab26487017d09e5aee0d71e86
2014-07-15 14:55:42 -07:00
Fabrice Di Meglio
bd9152f6ee Update DatePicker widget and its related dialog
- the old DatePicker widget is still there for obvious layout compatibility reasons
- add a new delegate implementation for having a new UI
- use the new delegate only for the DatePickerDialog (which does not need to be
the same)
- added support for Theming and light/dark Themes
- added support for RTL
- added support for Accessibility
- verified support for Keyboard
- verified that CTS tests for DatePicker are passing (for both the legacy and the
new widgets)

Also added a new HapticFeedbackConstants.CALENDAR_DATE and its related code for
enabling day selection vibration

Change-Id: I256bd7c21edd8f3b910413ca15ce26d3a5ef7d9c
2014-07-15 20:26:21 +00:00
Craig Mautner
003582f2f4 am a60bb211: am 30636967: Merge "Launch activity behind launching task." into lmp-dev
* commit 'a60bb211f2a51036bb02942deca6f718001527ec':
  Launch activity behind launching task.
2014-07-15 19:12:23 +00:00
Amith Yamasani
3cc8b491be am 83f39b51: am 1c44f4c7: Merge "Revert some new APIs for restrictions provider" into lmp-dev
* commit '83f39b510d6bd8237018500496aa8673b15e9332':
  Revert some new APIs for restrictions provider
2014-07-15 19:12:15 +00:00
Amith Yamasani
c8c8425b51 App restrictions schema and parser
Documented the restrictions schema in RestrictionsManager docs.
Added a parser to read the meta-data and XML file on the device.
Added more types and methods in RestrictionEntry to accomodate some
new types and construction modes.
Added a styleable for restriction attributes.

Slight tweak to permission response params.

Bug: 14582645
Change-Id: I193d1162741d110c100831cab33b48e2baf7426c
2014-07-15 17:16:54 -07:00
Craig Mautner
00e7ba05ac Merge "Launch activity behind launching task." into lmp-dev 2014-07-15 16:05:04 +00:00
Craig Mautner
bb74246278 Launch activity behind launching task.
Use ActivityOptions.makeLaunchTaskBehindAnimation() to launch tasks
behind the current task. Includes animations for launching and
launched tasks.

Fixes bug 16157517.

Change-Id: I0a94af70b4748592e94673b958ee824cfb3d7ec0
2014-07-15 11:36:25 -07:00
Andrew Lee
e3ec9da3d4 Merge "Add VideoState member variable to InCallCall." into lmp-dev 2014-07-15 16:04:58 +00:00
Andrew Lee
85f5d4263d Add VideoState member variable to InCallCall.
Bug: 16015750
Change-Id: Idee72075e992a94423a3ca7882959fbde03c4434
2014-07-15 10:33:22 -07:00
Amith Yamasani
4d922e6f74 Merge "Revert some new APIs for restrictions provider" into lmp-dev 2014-07-15 16:04:58 +00:00