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

146829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph Studer
4d953d0e93 Merge "NoMan: Use Notification.isGroupX() methods" into lmp-dev 2014-07-25 23:01:28 +00:00
Christoph Studer
3f31f5db65 NoMan: Use Notification.isGroupX() methods 
Change-Id: I041f449361959440a5be7375e655a31fd14e7862
 2014-07-31 16:55:32 +02:00
Christoph Studer
5e8cb22e60 Merge "NoMan: Filter group children for pre-L listeners" into lmp-dev 2014-07-25 23:01:28 +00:00
Christoph Studer
cef37cf5c7 NoMan: Filter group children for pre-L listeners 
Bug: 16189575
Change-Id: I5297b5273ab0aaee599981738eb736a49f21ce53
 2014-07-30 22:37:21 +02:00
Narayan Kamath
4abcd5c611 Merge "Switch TextUtils over to new ICU API." into lmp-dev 2014-07-25 23:01:28 +00:00
Narayan Kamath
31e6b1445f Switch TextUtils over to new ICU API. 
.. and use Locale.getScript() instead of ICU.getScript.

bug: 15876704

(cherry picked from commit 08b3516984850e04e9bb6feae29d691a7557191c)

Change-Id: Ifac179e0577d66062f32c95372b631bf574dfdf9
 2014-07-31 12:55:49 +01:00
Alexandra Gherghina
2f1cee80eb Upload new icons from ux 
Change-Id: I47da0780b1a4cce1104ae8fc00fcf01701a6d27a
 2014-07-31 10:27:24 +00:00
Sander Alewijnse
a87863a8bd Fix deadlock window manager and device policy manager. 
Removed all communication from wm to device policy manager.
Added initialization of cache in wm by dpms.

Change-Id: Ifa0b8bfcd625464b156d5cc0fb66d342deda1c27
 2014-07-31 09:16:46 +00:00
Jae Seo
d5ce975952 TIF: Make TvTrackInfo methods more explicit. 
This change addresses the following API council feedback:

TvTrackInfo:
-- Remove all KEY_/VALUE_ constants, and replace with explicit,
   strongly-typed accessor methods.
-- Add additional Bundle getExtras() method (in addition to the explicit
   types); most of the time this Bundle will be null.

Bug: 16542165
Change-Id: Ie48cb170b2bbf07d9460fdc8ed77d7db01799772
 2014-07-31 16:15:51 +09:00
Deepanshu Gupta
8d367bcd22 Merge "Fix classpath for AndroidLocale" into lmp-dev 2014-07-30 23:34:26 +00:00
Deepanshu Gupta
72c60ab7d4 Fix classpath for AndroidLocale 
Change-Id: I9af9ac05ec26f12529d51e566bf38789a2579390
 2014-07-31 05:10:03 +00:00
Christoph Studer
70d26c2d9c Merge "SysUI: Respect "no notifs on lockscreen" setting" into lmp-dev 2014-07-25 23:00:08 +00:00
Christoph Studer
1529e019e1 SysUI: Respect "no notifs on lockscreen" setting 
Setting the stack scroller to INVISIBLE didn't work. Now we just consider
all notifs as "not visible on lockscreen" instead.

Bug: 16650758
Change-Id: I4259c6ec2f663fc988377b8d5a259d6a0f827178
 2014-07-31 16:42:16 +02:00
Jorim Jaggi
61d37f6d1c Implement nice QS expansion transition in Keyguard 
Bug: 16010455
Bug: 15192264
Change-Id: I764652e73ea8e87ad12b9241e038bff843a0a221
 2014-07-31 13:48:43 +00:00
Dan Sandler
e9a96d34dd Merge "Fix docs build." into lmp-dev 2014-07-25 23:00:08 +00:00
Dan Sandler
dc418e3365 Fix docs build. 
Change-Id: I3be4c5b74e85d2491316986d8c3c0575cd01a8fc
 2014-07-31 02:27:52 -04:00
Jorim Jaggi
1045eee264 Merge "Factor out keyguard components of StatusBarHeaderView" into lmp-dev 2014-07-25 23:00:08 +00:00
Jorim Jaggi
4538027ded Factor out keyguard components of StatusBarHeaderView 
Make the header on keyguard a separate view, and move all Keyguard
components from StatusBarHeader into KeyguardHeaderView.

Change-Id: I1e2400d5c91898df3824fd8f27b10750d576a62c
 2014-07-31 15:02:59 +02:00
Wonsik Kim
8750dbca94 Merge "TIF: fix TvInputHal bug for multiple devices" into lmp-dev 2014-07-25 11:19:20 +00:00
Lajos Molnar
bacc82a509 MediaCodec: clean up image/buffer caching 
- cachedBuffers will be null in async mode
- track dequeued buffers in a map
- free dequeued buffers & bytebuffers

Bug: 14297827
Bug: 11990118
Change-Id: I9f8255921de25d05bf2c11fdaeda45cc185b9dd7
 2014-07-30 23:06:11 -07:00
Wonsik Kim
21aa3467cd TIF: fix TvInputHal bug for multiple devices 
In addition, add toString() method to TvStreamConfig for easier
debugging.

Bug: 16561829, Bug: 16666251
Change-Id: Ic192aef30f4d193b73bac7bc93a1563aa9af4377
 2014-07-31 11:05:34 +09:00
Andres Morales
11d2e53dc0 NFC Unlock api changes 
Bug: 16401635
Change-Id: I994bd80be40052c2f894199bb44ebbde40077f27
 2014-07-31 01:09:02 +00:00
destradaa
f9a274c9b8 Add support for sources in Geofencing APIs. 
Support setting the source when adding geofences.
b/14117199

Surface the source when FLP geofence changes state.
b/14119200

Change-Id: I50dc40a9caee400594e1778c98e284e0db0d5e66
 2014-07-30 23:35:08 +00:00
Ruben Brunk
6a7d8c4289 camera2: Implement request templates for LEGACY. 
Bug: 15116722
Change-Id: Ic32e2f597997489642e98bfd8c7582a300f6f29b
 2014-07-30 23:15:16 +00:00
Yao Chen
4056871031 Adds toString() in MediaBrowserItem 
Bug: 16676746
Change-Id: I61152dca66e6715807868a5c72a1fdf06c78d7ab
 2014-07-30 15:36:25 -07:00
Ruben Brunk
3fe9eba904 camera2: Add scene and effect mode for LEGACY. 
Bug: 15116722

Change-Id: I0797fccb5fdd8b959622c100f25b2950cfe4e115
 2014-07-30 22:09:41 +00:00
Adam Lesinski
63e646eed5 Add shared library support to aapt dump 
AAPT dump should be able to handle dynamic references
that often come with shared library resources.

Bug:16678251
Change-Id: I6c8cd943145aab20ca9db9694c8c433b3c64279b
 2014-07-30 21:53:48 +00:00
Behdad Esfahbod
805f6ebf17 Support FontFeatureSettings in Paint 
New API is hidden.

Bug: 15246510
Change-Id: Idefca06a366de0d87f53d123b5291788448de4d0
 2014-07-30 21:38:23 +00:00
Andres Morales
e9a8927662 Merge "Revert "NFC Unlock api changes"" into lmp-dev 2014-07-30 19:31:16 +00:00
Andres Morales
92b4b3c64d Revert "NFC Unlock api changes" 
This reverts commit 9fef5fbcd6d47ef86823b3a2d82d34801f9be335.

Change-Id: Idabe1c2901e0e26d38f84583308f69804ab2c1c3
 2014-07-30 21:30:50 +00:00
Andres Morales
131197aa6e NFC Unlock api changes 
Bug: 16401635
Change-Id: I138a9aa0bb156982b6c7656c51a1e2194776e4ed
 2014-07-30 21:17:06 +00:00
Joe Fernandez
9386003cb9 am a3e52154: am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 
* commit 'a3e521540b1143264033ca217d11b90ec20e6c54':
  docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
 2014-07-30 21:14:39 +00:00
Alan Lau
d38347ec51 am 40274ada: (-s ours) am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev 
* commit '40274ada4a8699a18836c369ca26ebb837ca37f2':
  Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
 2014-07-30 21:14:33 +00:00
Alan Lau
6a93d9d346 am 839ca0d5: (-s ours) am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev 
* commit '839ca0d5fa3b22e1e27aa8110d665aa6b6b91e26':
  Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""
 2014-07-30 21:14:29 +00:00
Alan Viverette
46359204a8 Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev 2014-07-29 21:36:00 +00:00
Alan Viverette
0c0dde7171 Update switch assets, fix SearchView asset 9-patch areas 
BUG: 16606037
BUG: 16467249
Change-Id: I9a5888e37317d1f8a6481f9733f784bbd37268f3
 2014-07-30 13:37:35 -07:00
keunyoung
fa75e3d465 Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev 2014-07-29 21:36:00 +00:00
keunyoung
1d0a7ccd00 add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode 
- When this flag is set, system no longer keeps the display on while in car mode.

bug: 15472822
Change-Id: I277368be5227eaf96213684598f278c39e4c34db
 2014-07-30 14:12:34 -07:00
Martijn Coenen
0bc94550b4 Merge "Make some NFC APIs @systemAPI." into lmp-dev 2014-07-29 21:36:00 +00:00
Martijn Coenen
29c2e3797a Make some NFC APIs @systemAPI. 
Change-Id: I12e292563a517211e4fae7a1f64021758f396d1a
 2014-07-30 21:03:07 +00:00
Jason Monk
e47df8466b Allow System UI access to VPN. 
Bug: 16153201
Change-Id: I5f5e9e0ed3e4e02d6a6995011356b350758f068d
 2014-07-30 20:51:14 +00:00
Raph Levien
ed1e6962ba Merge "Bump refcount of canvas created for Picture" into lmp-dev 2014-07-30 20:38:44 +00:00
Raph Levien
febccd05f2 Bump refcount of canvas created for Picture 
Both the Canvas and Picture objects will unref the canvas in their
finalizers, so an extra ref is needed. This had been present but was
inadvertently removed in the patch "Refactor android.graphics.Picture
JNI bindings." This patch simply restores the previous ref and comment.

Bug: 16399257
Change-Id: I9911826bd0e668bd25546ef54b0c9c1d467538c8
 2014-07-30 13:41:10 -07:00
Sean Wan
a5d3e0308e Merge "Fixed a NullPointerException in AccountManagerService." into lmp-dev 2014-07-25 23:00:08 +00:00
Adili Muguro
4e68b65723 Fixed a NullPointerException in AccountManagerService. 
Change-Id: If65d7870c609ae6c7467e26978ffd0ce0d52f518
 2014-07-30 14:10:16 -07:00
Robert Ly
36da7fe10f Merge "resolved conflicts for merge of 60e7f541 to lmp-dev" into lmp-dev 2014-07-30 19:31:16 +00:00
Robert Ly
0f9ea26dcc resolved conflicts for merge of 60e7f541 to lmp-dev 
Conflicts:
	docs/html/google/play/billing/gp-purchase-status-api.jd

Change-Id: I23f4c1a366b894a3cf5f70e26b32cd88bc66784c
 2014-07-30 14:09:25 -07:00
Lorenzo Colitti
691ed0561d Merge "Add logging of Legacy Type info." into lmp-dev 2014-07-24 16:04:26 +00:00
Robert Greenwalt
d49ac33b5e Add logging of Legacy Type info. 
There are some bugs where getActiveNetworkInfo gives bad data (seemingly)
and this will give the backing data in logs.

bug:16610051
Change-Id: Iad867485ad78daeb3e88665dcd0fdb0af756a3bf
 2014-07-30 16:31:24 -07:00
Youngsang Cho
8db80b6742 Merge "TIF: Reset SurfaceView whenever TvView tunes to a channel of different TV input" into lmp-dev 2014-07-24 16:04:26 +00:00