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

137561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lajos Molnar
a6716aade1 Merge changes I1fd178b6,I5093672e into lmp-preview-dev 
* changes:
  DO NOT MERGE: media.MediaCodec: hide NotificationCallback listener
  media.MediaCodec: document and fix-up setNotificationCallback
 2014-05-30 23:14:55 +00:00
Andrew Solovay
b9dfb12d2b am 38bb601e: am 305f3e21: am 79d3b623: am b9c5af3a: Merge "docs: Removed reference to draft apps." into klp-docs 
* commit '38bb601e78aa0557a7170e6e7de0050ef16bd802':
  docs: Removed reference to draft apps.
 2014-05-30 22:48:15 +00:00
Andrew Solovay
38bb601e78 am 305f3e21: am 79d3b623: am b9c5af3a: Merge "docs: Removed reference to draft apps." into klp-docs 
* commit '305f3e216a52af44e1296795803afe4ce17797ca':
  docs: Removed reference to draft apps.
 2014-05-30 22:43:54 +00:00
Andrew Solovay
305f3e216a am 79d3b623: am b9c5af3a: Merge "docs: Removed reference to draft apps." into klp-docs 
* commit '79d3b623fdcbac0dd47e526d66688227e4559d11':
  docs: Removed reference to draft apps.
 2014-05-30 22:39:35 +00:00
Andrew Solovay
79d3b623fd am b9c5af3a: Merge "docs: Removed reference to draft apps." into klp-docs 
* commit 'b9c5af3aef8591daef88c780f07b04a2d65ee895':
  docs: Removed reference to draft apps.
 2014-05-30 22:34:57 +00:00
Andrew Solovay
b9c5af3aef Merge "docs: Removed reference to draft apps." into klp-docs 2014-05-30 22:32:11 +00:00
RoboErik
4e4160cd5e am 80ec18a9: Merge changes I16ad392e,Ie26a7d01 into lmp-preview-dev 
* commit '80ec18a90a1ce3d1b68deba8bcf81abcca04e520':
  Refactor transport controls APIs
  API changes to sessions
 2014-05-30 22:21:07 +00:00
RoboErik
283c907a6a Merge changes I16ad392e,Ie26a7d01 into lmp-preview-dev 
* changes:
  Refactor transport controls APIs
  API changes to sessions
 2014-05-30 22:18:54 +00:00
roger.chang
8dd64036cd Hotspot 2.0 framework - Update implementation 
1. Change API naming
2. Combine 2 constructors
3. Add comments for usage

Change-Id: I13d98ed82879b46252bb86a7be7b0a5382024c72
 2014-05-30 15:03:50 -07:00
Ihab Awad
1091f59e5d am 8e206c02: (-s ours) Merge "DO NOT MERGE. Allow ConnectionService to ask Telecomm for ringback" into lmp-preview-dev 
* commit '8e206c02a1869a28820b146c05514124776288ca':
  DO NOT MERGE. Allow ConnectionService to ask Telecomm for ringback
 2014-05-30 21:55:31 +00:00
John Spurlock
822e5cc482 Resurrect global actions, remove confirmation for Power off. 
Instead of fast forwarding to the power off confirmation dialog,
display the global actions dialog with a single item by default,
with no confirmation.

Re-configure the bugreport option, it will appear if specified
in developer settings.

Bug:15109463
Change-Id: I5a19df8684d661345e42ad305f64f01c271aae19
 2014-05-30 17:51:43 -04:00
Ihab Awad
3da92d6df1 Merge "DO NOT MERGE. Allow ConnectionService to ask Telecomm for ringback" into lmp-preview-dev 2014-05-30 21:50:51 +00:00
Yin-Chia Yeh
ee36492fac am 7ebaa1ef: Merge "Camera2: update the range of metering weight" into lmp-preview-dev 
* commit '7ebaa1ef18fd20500efb87f75e933b9e35fb5470':
  Camera2: update the range of metering weight
 2014-05-30 21:43:55 +00:00
Craig Mautner
9de076a0a1 am b01b028e: Merge "Change PersistableBundle API per council\'s request" into lmp-preview-dev 
* commit 'b01b028ed9a1a5b1a585152adf182afe16135c10':
  Change PersistableBundle API per council's request
 2014-05-30 21:43:49 +00:00
Yin-Chia Yeh
f41799e7f7 Merge "Camera2: update the range of metering weight" into lmp-preview-dev 2014-05-30 21:41:42 +00:00
Craig Mautner
9edc732477 Merge "Change PersistableBundle API per council's request" into lmp-preview-dev 2014-05-30 21:40:17 +00:00
Winson Chung
876aff639c am 140a77b2: Merge "Updating paddings to design spec." into lmp-preview-dev 
* commit '140a77b280e5bfbfddf44ffc3c90014274bfa8d5':
  Updating paddings to design spec.
 2014-05-30 21:39:40 +00:00
John Spurlock
39c5f69771 am a2e3af9c: Merge "QuickSettings: Fix flash when expanding panel." into lmp-preview-dev 
* commit 'a2e3af9ce16f15a02d198f135321e6cd08daa435':
  QuickSettings: Fix flash when expanding panel.
 2014-05-30 21:39:35 +00:00
Igor Murashkin
dbce83bf20 am 511b84d2: Merge "camera2: Change android.lens.focusRange to Pair<Float,Float>" into lmp-preview-dev 
* commit '511b84d26b3e4acfcee9ca2864588538b9801708':
  camera2: Change android.lens.focusRange to Pair<Float,Float>
 2014-05-30 21:39:30 +00:00
Chris Wren
9e427694a5 am 3d2f4c6b: Add people signals to Zen mode. 
* commit '3d2f4c6b1f3496de3b9c8ece1556684a6cb27903':
  Add people signals to Zen mode.
 2014-05-30 21:39:24 +00:00
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
Florin Malita
5c3d927e17 Add a native Canvas wrapper. 
Instead of storing a direct SkCanvas reference, Canvas now tracks
an opaque native wrapper class. The native wrapper can be used to
store additional info for emulating deprecated Skia features
(at this point it only stores a canvas).

Some notes:

* all native handle -> SkCanvas conversions are routed through a
  handful of native utility methods.
* safeCanvasSwap() refactored as a lower level setNativeBitmp() - which
  is what clients need.
* removed unused get_thread_msec() (Canvas.cpp)

Change-Id: I715a5a6f1e1621c1cfc1e510ae4f2ea15cf11114
 2014-05-30 16:11:04 -04: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