drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
137,540 Commits 1 Branch 0 Tags
Commit Graph

137540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
9fd259dd26 am bef7d256: Merge "Track Zen Mode status in the NotificationRecord" into lmp-preview-dev 
* commit 'bef7d25652c767f9850ec7ad6c51812b1c8db69d':
  Track Zen Mode status in the NotificationRecord
 2014-05-30 21:39:19 +00:00
Adam Powell
1994f41803 am d4a453ce: Merge "Compatibility fix for apps that construct Notification.Builders early" into lmp-preview-dev 
* commit 'd4a453ce132c926c136015e6799b0528656c9409':
  Compatibility fix for apps that construct Notification.Builders early
 2014-05-30 21:39:14 +00:00
Sreeram Ramachandran
1a74510636 am 5a734bd7: Merge "Support legacy routes added by apps via ensureRouteToHost()." into lmp-preview-dev 
* commit '5a734bd78e83afeee5833b56f04ac99113b97542':
  Support legacy routes added by apps via ensureRouteToHost().
 2014-05-30 21:39:09 +00:00
John Reck
c6b6154ac1 am ea5af639: Merge "Re-jigger layers" into lmp-preview-dev 
* commit 'ea5af63965bf323580aa1e2854efb2f8cc3dc396':
  Re-jigger layers
 2014-05-30 21:39:04 +00:00
Wei Wang
75f5b3a8dd am 19bdd64c: Merge "Address API review comments. 1. Moved le stuff to it\'s subpackage. Remove BluetoothLe for all classes except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings. 2. Make all callbacks abstract classes instead of interfaces. 3. Moved Advertis 
* commit '19bdd64c3b9dd16778575164c13c8af798832f01':
  Address API review comments. 1. Moved le stuff to it's subpackage. Remove BluetoothLe for all classes except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings. 2. Make all callbacks abstract classes instead of interfaces. 3. Moved AdvertisementData and ScanRecord out and removed AdvertiseBaseData 4. Removed newBuild and use new Builder for all builders. 5. Using setxxx in builders. 6. Misc other changes.
 2014-05-30 21:38:59 +00:00
Santos Cordon
b69f1bddfe am 6d052adc: Merge "Update showCallScreen to use Telecomm (1/6)" into lmp-preview-dev 
* commit '6d052adc910bf2d2775881528cef3e41fe2cd14b':
  Update showCallScreen to use Telecomm (1/6)
 2014-05-30 21:38:54 +00:00
Andrew Solovay
aee20f92b8 docs: Removed reference to draft apps. 
When appropriate, changed references to "draft" apps to alpha and beta apps.
Left the "draft" info in the deprecated file v2/billing_integrate.jd, but
added a note that draft apps are no longer supported.

Docs are staged to:

in-app billing:
http://asolovay.mtv:9011/google/play/billing/billing_admin.html
http://asolovay.mtv:9011/google/play/billing/billing_testing.html

http://asolovay.mtv:9011/google/play/billing/v2/billing_integrate.html
(deprecated doc; just noted that draft is no longer supported)

LVL:
http://asolovay.mtv:9011/google/play/licensing/overview.html
http://asolovay.mtv:9011/google/play/licensing/licensing-reference.html

OBBs
http://asolovay.mtv:9011/google/play/expansion-files.html

As per a request from Dirk, I added a section to the "Testing In-App
Billing" page noting that draft apps are no longer supported, and
linking to the section on alpha and beta channels; I put in a link
to the new section in each place where we'd previously talked about
draft apps.

Also fixed formatting in a few code samples, where over-long lines were
forcing the code box to use a scroll bar.

bug: 15013770
Change-Id: I1368b9b5ebf2a0c22f84fcbcd5f37401b390c423
 2014-05-30 14:38:52 -07:00
Dianne Hackborn
25ceaab596 am 3a967f83: Merge "Mark getRecentTasks() and getRunningTasks() as deprecated." into lmp-preview-dev 
* commit '3a967f8331a29ec1b5b8a44cda028417e0ef1e2c':
  Mark getRecentTasks() and getRunningTasks() as deprecated.
 2014-05-30 21:38:49 +00:00
Adam Powell
2a4b95eb36 am 9aeea623: Guard against missing progress bars in window decor layouts 
* commit '9aeea623fa93d5aaaa214e2bc8557fb36a58cf7a':
  Guard against missing progress bars in window decor layouts
 2014-05-30 21:38:44 +00:00
Mike Reed
ae22109fa6 Merge "switch to non-deprecated SkBlurStyle type" 2014-05-30 21:34:11 +00:00
Santos Cordon
bf82544a96 Merge "Preempt build error from merge with CL (2/2)" 2014-05-30 21:31:57 +00:00
Santos Cordon
dd36901ac0 Preempt build error from merge with CL (2/2) 
Merging CL: Ib674e2e48efaa1cc97d1513dc2c2b27fdb343657

Change-Id: Ic4944b27f9d39dbaccb6baa5ba6761dc4663cd02
 2014-05-30 14:27:03 -07:00
Vinit Deshpande
e73a0ab494 Merge "Accomoditing API Review feedback for WifiScanner" 2014-05-30 21:15:13 +00:00
Ihab Awad
f835897f9f DO NOT MERGE. Allow ConnectionService to ask Telecomm for ringback 
Provides a pass-through from the ConnectionService API to Telecomm allowing
a ConnectionService to either play the ringbacks on its own, or ask Telecomm
to play the ringbacks on its behalf.

Bug: 15190301
Change-Id: Ib0f2ce9bf798ec0df0e6d33559174c82de059a94
 2014-05-30 21:10:43 +00:00
Winson Chung
b2f4bc8727 Merge "Updating paddings to design spec." into lmp-preview-dev 2014-05-30 21:06:18 +00:00
Mike Reed
686534db8d switch to non-deprecated SkBlurStyle type 
Will allow skia to remove SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE

Change-Id: I0039dd7e0e807080d2b4f9e648df93123dd09e8d
 2014-05-30 21:05:47 +00:00
John Spurlock
3a00419a13 Merge "QuickSettings: Fix flash when expanding panel." into lmp-preview-dev 2014-05-30 20:29:19 +00:00
John Spurlock
bc3a5e9469 QuickSettings: Fix flash when expanding panel. 
Bug:15186962
Change-Id: Ib42776989d687f8873f7bd3c2567c31a23e0490f
 2014-05-30 16:20:05 -04:00
Igor Murashkin
1998daf1ee Merge "camera2: Change android.lens.focusRange to Pair<Float,Float>" into lmp-preview-dev 2014-05-30 20:19:32 +00:00
Chris Wren
99f963ea04 Add people signals to Zen mode. 
Depends-On: I51fcf689ddbee7715e3387b865f18a715887c943
Change-Id: I7c91dec1afeb54505426c4da59ec4d072a60c240
 2014-05-30 16:16:23 -04:00
Chris Wren
4f0e39a929 Merge "Track Zen Mode status in the NotificationRecord" into lmp-preview-dev 2014-05-30 20:15:38 +00:00
Craig Mautner
0a8e160eb5 Change PersistableBundle API per council's request 
Fixes bug 15192573.

Change-Id: Ib98ef132c8c12e68e805cb3c0b1f7ae75940f17c
 2014-05-30 13:14:44 -07:00
Chris Wren
333a61c3a5 Track Zen Mode status in the NotificationRecord 
This requires the record to be present in makeRankingUpdateForListener,
however, if the ranking object is created before the post to the handler,
then no cloning is necessary.

Depends-On: I907a1ff28123219db1c08889d723ad1b70b191ab
Change-Id: I51fcf689ddbee7715e3387b865f18a715887c943
 2014-05-30 16:09:51 -04:00
Adam Powell
2157b9dcef am a082f3a0: Merge "Fix bad casts in action bars" into lmp-preview-dev 
* commit 'a082f3a05ede6ae5fa4ab64b30a77de18579264c':
  Fix bad casts in action bars
 2014-05-30 20:08:35 +00:00
John Spurlock
910219d859 am 586297d2: Merge "QuickSettings: Maintain tile panel Y in detail mode." into lmp-preview-dev 
* commit '586297d29dfa3a1e80c795698a1001dd7dfb211c':
  QuickSettings: Maintain tile panel Y in detail mode.
 2014-05-30 20:08:29 +00:00
Adam Powell
da44532b61 Merge "Compatibility fix for apps that construct Notification.Builders early" into lmp-preview-dev 2014-05-30 20:01:54 +00:00
Sreeram Ramachandran
b0e25870dc Merge "Support legacy routes added by apps via ensureRouteToHost()." into lmp-preview-dev 2014-05-30 19:47:50 +00:00
John Reck
ca8eb243d1 Merge "Re-jigger layers" into lmp-preview-dev 2014-05-30 19:46:24 +00:00
Wei Wang
94fec83db4 Merge "Address API review comments. 1. Moved le stuff to it's subpackage. Remove BluetoothLe for all classes except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings. 2. Make all callbacks abstract classes instead of interfaces. 3. Moved AdvertisementData and ScanRecord out and removed AdvertiseBaseData 4. Removed newBuild and use new Builder for all builders. 5. Using setxxx in builders. 6. Misc other changes." into lmp-preview-dev 2014-05-30 19:39:11 +00:00
Santos Cordon
515e09b837 Merge "Update showCallScreen to use Telecomm (1/6)" into lmp-preview-dev 2014-05-30 19:36:41 +00:00
Adam Powell
bf06fa0479 Compatibility fix for apps that construct Notification.Builders early 
Some apps in the wild are known to construct a Notification.Builder
from within their Activity constructor, passing said Activity instance
as the Context parameter. However at this point in the Activity's
lifecycle the ContextWrapper's base context has not yet been populated
and most calls to Context methods will fail.

Even though this was technically undefined behavior in the past, as
apps have little to no way to guess at these internal implementation
details it's probably best to preserve old expectations. Add a note
in Notification.Builder for future framework developers and remove the
offending call - the associated field was never used anyway.

ಠ_ಠ

Change-Id: I4cf3df10be14739babc8ae9a969d261a7ecf8beb
 2014-05-30 12:32:18 -07:00
Dianne Hackborn
f69af6b6d5 Merge "Mark getRecentTasks() and getRunningTasks() as deprecated." into lmp-preview-dev 2014-05-30 19:31:28 +00:00
Dianne Hackborn
a25a8b289b Mark getRecentTasks() and getRunningTasks() as deprecated. 
Change-Id: Idba79d7a4c0b9f0929f8dd27f25bd6aa548f5622
 2014-05-30 12:30:35 -07:00
Michael Wright
01101ff09d Merge "Add layout for OnLive controller with USB adapter" 2014-05-30 19:27:38 +00:00
Michael Wright
8111462d01 Add layout for OnLive controller with USB adapter 
Change-Id: Ie21ba6550f62eb4797e0e51104b99c2a4a7c44d7
 2014-05-30 12:27:00 -07:00
John Reck
d72e0a339b Re-jigger layers 
Bug: 15185239
 Bug: 15238382

 Make DeferredLayerUpdater ref counted so that
 HardwareLayer:finalizer() works non-crashily on
 leaked layers
 Give DeferredLayerUpdater the ability to have a layer destroyer
 set so that leaked layers can still be recycled on the
 RenderThread
 Order layer updates based off of pushLayerUpdate() calls to fix
 issue with nested layers

Change-Id: I4449cee607f7e5126e02fed7464cf48038e3dfdf
 2014-05-30 12:19:33 -07:00
Yin-Chia Yeh
97f1c85499 Camera2: update the range of metering weight 
Limit the range of metering weight to 0-1000.

Bug: 15315352
Change-Id: Iceb13b72508cb3c9f758bdcb1b69b6b11ec5aaf8
 2014-05-30 12:05:48 -07:00
Robert Shih
5a7de6f3f8 am a037bceb: am a034dac7: android_media_MediaMuxer_setLocation: amended signature. 
* commit 'a037bcebfa0afdf89e273b207f134e4c5d909a65':
  android_media_MediaMuxer_setLocation: amended signature.
 2014-05-30 19:01:28 +00:00
Kenny Root
25e40de45f resolved conflicts for merge of b68f5f09 to master 
Change-Id: Ib8dd3a353f40a3357c8dc5ac591cd5e3ab4d0a4b
 2014-05-30 11:51:20 -07:00
Winson Chung
cd23c849af Updating paddings to design spec. 
Change-Id: I11286937216494304c38c87280bc69ef9522c596
 2014-05-30 11:44:27 -07:00
Santos Cordon
3534ede572 Update showCallScreen to use Telecomm (1/6) 
- Add API methods to InCallService and ITelecommService.
- Remove old methods from ITelephony.
- Route the TelephonyManager methods through ITelecommService instead of
  ITelephony.
- Update Lock screen to use TelephonyManager instead of ITelephony.

Bug: 15008165
Change-Id: Ib674e2e48efaa1cc97d1513dc2c2b27fdb343657
 2014-05-30 11:35:42 -07:00
Igor Murashkin
5743868e15 camera2: Change android.lens.focusRange to Pair<Float,Float> 
Since the focus range is defined in diopters (1/distance), it just so
happens that in a range [near, far] near >= far which is against the
android.util.Range contract.

Change it to pair instead.

Also adds a marshaler for Pairs since they didn't have one before
(and aren't parcelable).

Bug: 15335269
Change-Id: If2f3259aeec072438a1c18c1b9728a4c81e92a40
 2014-05-30 11:28:49 -07:00
Sreeram Ramachandran
515350a5e2 Support legacy routes added by apps via ensureRouteToHost(). 
Change-Id: I0ee1ca89fdc859d75a89021ca8c1902811b1e4a9
(cherry picked from commit fb17b32550de624b7f476b70b7a2fc77f31dde7d)
 2014-05-30 18:21:34 +00:00
Sebastien Hertz
26e8f040ba am f02efe45: Merge "Report runtime information to DDMS" into lmp-preview-dev 
* commit 'f02efe4504c9542b5c81c0ce890f092c4019540b':
  Report runtime information to DDMS
 2014-05-30 18:10:00 +00:00
Robert Shih
a037bcebfa am a034dac7: android_media_MediaMuxer_setLocation: amended signature. 
* commit 'a034dac7be0658e59c73a880e958cab3c723323b':
  android_media_MediaMuxer_setLocation: amended signature.
 2014-05-30 18:05:35 +00:00
Chris Craik
b68f5f0932 am 4d31c547: am ce7fa780: Merge "Fix a resource race bug in PathCache" 
* commit '4d31c5474bcc4bcc6a6d8dfe232360dad701a3fc':
  Fix a resource race bug in PathCache
 2014-05-30 18:03:32 +00:00
Adam Powell
eec8f0cbbb Guard against missing progress bars in window decor layouts 
This is temporary; in general requesting the window feature means you
have the progress bars available. This can be removed once Toolbar
supports the additional progress bar features.

Bug 15329703

Change-Id: Ica520a4fb600fd132a88c5204197185d7e0689c9
 2014-05-30 11:00:00 -07:00
Chris Craik
4d31c5474b am ce7fa780: Merge "Fix a resource race bug in PathCache" 
* commit 'ce7fa780cdee2730b570cc34066f15c74d44e6ef':
  Fix a resource race bug in PathCache
 2014-05-30 17:59:51 +00:00
Chris Craik
ce7fa780cd Merge "Fix a resource race bug in PathCache" 2014-05-30 17:56:42 +00:00
Adam Powell
a24114e7b1 Merge "Fix bad casts in action bars" into lmp-preview-dev 2014-05-30 17:49:19 +00:00