7303 Commits

Author SHA1 Message Date
Evan Charlton
acb28a7af7 Merge "Fix the build breakage (update API & javadocs)" 2014-06-06 00:50:35 +00:00
Raph Levien
748a3779f3 am 455b351b: Merge "Make elegantTextHeight xml attribute public" into lmp-preview-dev
* commit '455b351bba515c3a7e6139368c4110abbf1e4e89':
  Make elegantTextHeight xml attribute public
2014-06-06 00:45:43 +00:00
Raph Levien
5b29e12cfb Merge "Make elegantTextHeight xml attribute public" into lmp-preview-dev 2014-06-06 00:42:34 +00:00
Evan Charlton
7960fd917a Fix the build breakage (update API & javadocs)
Update API and Javadocs to fix the build.

Change-Id: I108e4d824eabb68f8edd864bf67a16188672b01b
2014-06-05 17:31:11 -07:00
Yin-Chia Yeh
abfaf964a5 am 6d892689: Merge "Camera2: Do not hide TonemapCurve construtor" into lmp-preview-dev
* commit '6d892689f569871e2e711669c0262a7d25b3e091':
  Camera2: Do not hide TonemapCurve construtor
2014-06-05 23:37:07 +00:00
Yin-Chia Yeh
ffff217134 Merge "Camera2: Do not hide TonemapCurve construtor" into lmp-preview-dev 2014-06-05 23:33:38 +00:00
Zhijun He
169a149d55 am b67beb8e: Merge "Camera2: Hide input stream related key and enum" into lmp-preview-dev
* commit 'b67beb8e8b9115c1ba796a57f1bb59822e6a1ce1':
  Camera2: Hide input stream related key and enum
2014-06-05 23:21:03 +00:00
Zhijun He
f98a3c020d Merge "Camera2: Hide input stream related key and enum" into lmp-preview-dev 2014-06-05 23:15:17 +00:00
Yorke Lee
8c2d8c0c27 Revert "API changes to Telephony per API review"
The original change was submitted into lmp-preview-dev and should
not have been auto-merged to master.

This reverts commit 80327f7a31b19213ec48e1ab66e6bdc8e76cb0fe.

Change-Id: I9ff8a868ffa3135583c52ef97b15311107716899
2014-06-05 22:55:49 +00:00
ztenghui
537d7ea039 am 42decb1b: Merge "API Review: move the CreateRevealAnimator to ViewAnimationUtils" into lmp-preview-dev
* commit '42decb1bfe354923205a7cdf856f395f9070b64f':
  API Review: move the CreateRevealAnimator to ViewAnimationUtils
2014-06-05 22:39:11 +00:00
ztenghui
2050d39e08 Merge "API Review: move the CreateRevealAnimator to ViewAnimationUtils" into lmp-preview-dev 2014-06-05 22:32:41 +00:00
Raph Levien
e1c4a0d299 Make elegantTextHeight xml attribute public
The elegantTextHeight attribute of TextView was made public through
Java code, but the corresponding attribute wasn't public. This patch
makes it so.

This is a fix for bug 15428791 "elegantTextHeight is hidden (not in
android.R.attr)"

Change-Id: I7011f10ae58fd2e212da9cbaca4a484f011d8fed
2014-06-05 22:30:37 +00:00
Ji-Hwan Lee
4a2e599b5a am b3412adf: Merge "TvContract: Add channel logo and program thumbnail" into lmp-preview-dev
* commit 'b3412adf92b9d932b600acf44c4463cf06387a8e':
  TvContract: Add channel logo and program thumbnail
2014-06-05 22:23:11 +00:00
Yorke Lee
f537259ec4 am 87d1dbc5: Merge "API changes to Telephony per API review" into lmp-preview-dev
* commit '87d1dbc52e473227b2b4bc0d95ca48cfb3363adc':
  API changes to Telephony per API review
2014-06-05 22:23:03 +00:00
Ji-Hwan Lee
cc15afbe12 Merge "TvContract: Add channel logo and program thumbnail" into lmp-preview-dev 2014-06-05 22:12:08 +00:00
Yorke Lee
66c11e1f84 Merge "API changes to Telephony per API review" into lmp-preview-dev 2014-06-05 22:02:22 +00:00
Alan Viverette
c954e61cd7 am 3966c960: Merge "Add defaults for caption colors and edge type" into lmp-preview-dev
* commit '3966c9604e55c9183a6d1ba8b3540add3be4434f':
  Add defaults for caption colors and edge type
2014-06-05 21:00:32 +00:00
Yorke Lee
d8819baf85 API changes to Telephony per API review
* Make context the first argument for isLocalEmergencyNumber and
isPotentialLocalEmergencyNumber

* Hide DisconnectCause
Bug: 15432083

Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9
2014-06-05 13:48:12 -07:00
ztenghui
62f30e0bb1 API Review: move the CreateRevealAnimator to ViewAnimationUtils
b/15451650

Change-Id: If270bbf757047ce7847cab457d3836d756830124
2014-06-05 13:45:15 -07:00
Alan Viverette
4586b0da63 Merge "Add defaults for caption colors and edge type" into lmp-preview-dev 2014-06-05 20:37:22 +00:00
Ji-Hwan Lee
4c1959cc45 TvContract: Add channel logo and program thumbnail
Channel logo is exposed via its own content URI,
"content://android.media.tv/channel/#/logo".

Program thumbnail is added as an URI column in existing program table.

Change-Id: I8dd636bbea9d3fa991ad42ccc03a198e8c1d051d
2014-06-06 05:12:12 +09:00
Matthew Williams
38b200fe6c am 1a2f47d4: Merge "Add persistence of tasks for TaskManager & BatteryController" into lmp-preview-dev
* commit '1a2f47d4cdc0ea40dff1b88f7976d64c19d687b1':
  Add persistence of tasks for TaskManager & BatteryController
2014-06-05 20:08:54 +00:00
Ihab Awad
fbb092f26e DO NOT MERGE. Implement connection error dialogs (1/4)
Implement reporting of connection errors from ConnectionServices through
Telecomm to the InCallUI.

Bug: 15195720
Bug: 15117141
Change-Id: I0e1443f75a175a212fb19afde5a7eadef15d239d
(cherry picked from commit 976bfe497da31fa8322969648ffbe77898941d0c)
2014-06-05 12:56:57 -07:00
Zhijun He
6593acd95d Camera2: Hide input stream related key and enum
Bug: 14622091
Change-Id: Id8fc20b752da876f00a94d0262cd9468951bb36d
2014-06-05 12:49:56 -07:00
Yin-Chia Yeh
83a9e4d864 Camera2: Do not hide TonemapCurve construtor
Do not @hide TonemapCurve constructor since it's also a
control key.

bug: 14628001
Change-Id: I17384f42f5c2db2371d1c09030d04a1b9637045e
2014-06-05 11:34:48 -07:00
Matthew Williams
3d86fd2bb9 Add persistence of tasks for TaskManager & BatteryController
Tasks are persisted only if the client has the RECEIVE_BOOT_COMPLETED
permission. This applies to both periodic and one-off tasks.
Write out task as xml, using PersistableBundle for the extras data.
Todo: Add persistable bundle to xml when ag/468207 is merged.

Also added BatteryController logic.

Change-Id: I23eeeb8b3bc6ba155e7fa4ec25857a68ee8b1567
2014-06-05 18:28:43 +00:00
Jean-Michel Trivi
9f47b84c04 Merge "AudioAttributes: parcelable, hide support for tags" 2014-06-05 18:06:06 +00:00
Yorke Lee
b68bf447f6 am d6138017: Merge "API changes per API review for contacts" into lmp-preview-dev
* commit 'd6138017d9d435b176dff424ff75c8e8ea298d06':
  API changes per API review for contacts
2014-06-05 15:21:22 +00:00
Adam Connors
78b245bfea Merge "Fix build break (include current.txt)" 2014-06-05 14:10:25 +00:00
Adam Connors
f9c98a7008 Fix build break (include current.txt)
I forgot to commit this... sorry.

Change-Id: I5efca4d9447f1792a095dd64210a124c29e6a917
2014-06-05 15:07:53 +01:00
Yorke Lee
8089ce7cbc Merge "API changes per API review for contacts" into lmp-preview-dev 2014-06-05 13:43:35 +00:00
Ihab Awad
f73b23e7a1 Merge "DO NOT MERGE. Implement connection error dialogs (1/4)" into lmp-preview-dev 2014-06-05 05:24:38 +00:00
Alan Viverette
e88aee8ad8 Add defaults for caption colors and edge type
BUG: 8151470
Change-Id: I4d7b75bf647aeded77b4000cdcd37e9ace46a374
2014-06-04 18:35:42 -07:00
Yorke Lee
1ca440b38f API changes per API review for contacts
* Improve documentation for REMOVE_DUPLICATE_ENTRIES
* Hide android.provider.ContactsContract.PinnedPositions, it will be
reworked and improved for L.
* Hide android.provider.ContactsContract.Preferences - we will rework
the various apps that are relying on this to use their own preferences
instead
* Remove inheritance of hidden interfaces in android.provider.Contacts

Bug: 15430304
Change-Id: I0f96e8a506083df21023f9b95655f0ce5244bdce
2014-06-04 18:16:26 -07:00
Jean-Michel Trivi
b45c273033 AudioAttributes: parcelable, hide support for tags
Make the AudioAttributes class parcelable.

Hide support for adding and querying tags, there is no SDK-backed
  use case for this feature.

Bug 15306334

Change-Id: Idb67a735778e687d73020ed0120643f31fc230a6
2014-06-04 17:22:16 -07:00
Amith Yamasani
8927d4f590 Fix messed up current.txt
Change-Id: Id472fda6112593c1ba933100249bbd5c6ecb0ccb
2014-06-04 17:19:24 -07:00
Igor Murashkin
2ac6c43312 am 97b2bc9a: Merge "camera2: Change CaptureListener callbacks to include the session (api)" into lmp-preview-dev
* commit '97b2bc9a05a56dad609360f8fec1e5a51059e656':
  camera2: Change CaptureListener callbacks to include the session (api)
2014-06-04 23:42:58 +00:00
Igor Murashkin
6e9c5cc617 Merge "camera2: Change CaptureListener callbacks to include the session (api)" into lmp-preview-dev 2014-06-04 23:31:54 +00:00
Ihab Awad
fc91b7d448 DO NOT MERGE. Implement connection error dialogs (1/4)
Implement reporting of connection errors from ConnectionServices through
Telecomm to the InCallUI.

Bug: 15195720
Bug: 15117141
Change-Id: I0e1443f75a175a212fb19afde5a7eadef15d239d
2014-06-04 23:25:04 +00:00
Igor Murashkin
21547d66a9 camera2: Change CaptureListener callbacks to include the session (api)
* Also makes CameraDevice an abstract class (API)

Bug: 15428219
Bug: 14964443
Change-Id: I0e8c8309186aad59570aac7e0f998bb615405f0a
2014-06-04 16:03:32 -07:00
Ruben Brunk
fcab516cd4 am 37532379: Merge "DNG: Hide unimplemented methods." into lmp-preview-dev
* commit '37532379e7c770555b140332112a34fe716fed22':
  DNG: Hide unimplemented methods.
2014-06-04 22:58:48 +00:00
Matthew Williams
64939ae385 DO NOT MERGE Redact SyncService stuff from master
Cherry-pick over from master.
This changes the API surface area, deleting things we aren't releasing.
I'll do the internal clean-up at the same time I do the SyncManager
refactor to sit on top of the TaskManager.
Bug: 14997851

Change-Id: Ieebbbcd3324827098e88b36e45e6e82315a51e65
2014-06-04 22:46:25 +00:00
Matthew Williams
4b8bb98d63 Merge "Redact SyncService stuff from master" 2014-06-04 22:45:24 +00:00
Ruben Brunk
35677d1762 Merge "DNG: Hide unimplemented methods." into lmp-preview-dev 2014-06-04 22:25:18 +00:00
Matthew Williams
5a9decd589 Redact SyncService stuff from master
This changes the API surface area, deleting things we aren't releasing.
I'll do the internal clean-up at the same time I do the SyncManager
refactor to sit on top of the TaskManager.
Bug: 14997851
Change-Id: Ibefbb246f0e98d3159399151744279902468a23c
2014-06-04 14:55:53 -07:00
Ruben Brunk
8e783f7a52 DNG: Hide unimplemented methods.
Bug: 15112503
Change-Id: I31187a92b610af68fb854a27a564abf7d0635478
2014-06-04 13:21:04 -07:00
Alan Viverette
90efa8f08c am 1604d630: Merge "Fix action bar menu inflation context" into lmp-preview-dev
* commit '1604d6302a3db07a57827b1c38f7fda21c28d3c6':
  Fix action bar menu inflation context
2014-06-04 18:45:10 +00:00
Alan Viverette
22b893fde1 Merge commit '096d52fb' into manualmerge
Conflicts:
	api/current.txt

Change-Id: Iaf1f9172a73e74885475c30ffefcb7d0e32a5883
2014-06-04 11:42:06 -07:00
Adrian Roos
b803ad3c2c Hide TrustAgentService in lmp-preview - DO NOT MERGE
Bug: 15287044
Change-Id: Iba0d53b87bcb4bddccec89cf943ed65491aa9d76
2014-06-04 15:04:19 +00:00
Leon Scroggins III
a578ab00c4 Merge "Ignore inPurgeable and inInputShareable." 2014-06-04 14:04:18 +00:00