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

138514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
3b983a74c6 Fix default stroke width and NPE for line with no stroke width 
Also fixes restart on visiblity change in AnimationDrawable

BUG: 15437284
Change-Id: I698e7ffb11489061a38fbcd5cea10ba11a6abb34
 2014-06-05 13:43:25 -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
Justin Koh
92e49599e9 am c7a5d4a9: am 8200b667: Merge "Revert "Add check to allow notification listener packages to post >50 notifications"" into klp-modular-dev 
* commit 'c7a5d4a920a7cd865da93ba56c35403c43c69971':
  Revert "Add check to allow notification listener packages to post >50 notifications"
 2014-06-05 20:09:56 +00:00
Winson Chung
87d8ac9cf9 am 16b5e60d: Merge "Fixing issue with broadcast being sent before boot completed." into lmp-preview-dev 
* commit '16b5e60d49ea952a86f71da479a980e37ea652cf':
  Fixing issue with broadcast being sent before boot completed.
 2014-06-05 20:08:57 +00:00
Raph Levien
2400476943 am e0ebf19c: Merge "Support for context in Minikin shaping" into lmp-preview-dev 
* commit 'e0ebf19cbfa60ba3eb0891d5e8416b70b212bc36':
  Support for context in Minikin shaping
 2014-06-05 20:08:57 +00:00
Raph Levien
4c25e5a1f9 am 79fbad97: Merge "Support for scaleX and skewX in Minikin" into lmp-preview-dev 
* commit '79fbad97705d191f80d7af7e494ca4a5fed3a783':
  Support for scaleX and skewX in Minikin
 2014-06-05 20:08:56 +00:00
Raph Levien
ef7dfc08ba am eb77dfe1: Merge "Fix broken macStyle flags on Roboto-MediumItalic" into lmp-preview-dev 
* commit 'eb77dfe14d51243b78ac856b582d39cacc4cd9b9':
  Fix broken macStyle flags on Roboto-MediumItalic
 2014-06-05 20:08:55 +00: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
Justin Koh
c7a5d4a920 am 8200b667: Merge "Revert "Add check to allow notification listener packages to post >50 notifications"" into klp-modular-dev 
* commit '8200b667ea75b7d5353343f9e2f22e33b373077e':
  Revert "Add check to allow notification listener packages to post >50 notifications"
 2014-06-05 20:05:08 +00:00
Winson Chung
1494f8671e Merge "Fixing issue with broadcast being sent before boot completed." into lmp-preview-dev 2014-06-05 20:04:40 +00:00
Dan Sandler
ed50e94d6c am 4ccaa092: Merge "Don\'t show private notifications if a secure lockscreen is merely occluded." into lmp-preview-dev 
* commit '4ccaa092d49deb84885b5daf2e6d6f1c745d56bf':
  Don't show private notifications if a secure lockscreen is merely occluded.
 2014-06-05 20:04:36 +00:00
Winson Chung
5abdceb64b Fixing issue with broadcast being sent before boot completed. 
Bug: 15444478
Bug: 15109101
Change-Id: I0fd5d32761c84ff237bce8328f23907bbf12ee6a
 2014-06-05 20:01:25 +00:00
Ihab Awad
6be08229ae Merge "DO NOT MERGE. Implement connection error dialogs (1/4)" 2014-06-05 19:59:53 +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
George Mount
dc21d3b280 API review: Constants to Gravity and Epicenter. 
Bug 15432037

Constants for LEFT, RIGHT, TOP, BOTTOM moved to using Gravity.
Epicenter method name changed.

Change-Id: If226613794623fd50fdaf8fc61b0020d17628f68
 2014-06-05 12:47:33 -07:00
Raph Levien
0ead890d1c Merge "Support for context in Minikin shaping" into lmp-preview-dev 2014-06-05 19:37:08 +00:00
Raph Levien
30d3c97f29 Merge "Support for scaleX and skewX in Minikin" into lmp-preview-dev 2014-06-05 19:26:33 +00:00
Raph Levien
a8dcbdcec8 Merge "Fix broken macStyle flags on Roboto-MediumItalic" into lmp-preview-dev 2014-06-05 19:26:21 +00:00
Chris Craik
18bf85d4ae Fix issues around GL on incorrect thread 
bug:15416165
bug:15414673

DisplayListRenderer must override these callbacks from
StatefulBaseRenderer, since the super implementations call GL.
Eventually, we'll just have DisplayListRenderer inherit from
StatefulBaseRenderer directly.

Change-Id: I7b20aa0ac6cae3bf6c6969c63bf9ba98ab2831ff
 2014-06-05 12:22:15 -07:00
Matthew Williams
afcece8115 Merge "Add persistence of tasks for TaskManager & BatteryController" into lmp-preview-dev 2014-06-05 19:15:25 +00:00
Justin Koh
8200b667ea Merge "Revert "Add check to allow notification listener packages to post >50 notifications"" into klp-modular-dev 2014-06-05 19:03:33 +00:00
Justin Koh
500a6b0ca6 Revert "Add check to allow notification listener packages to post >50 notifications" 
Broke build.

This reverts commit 2dbd36fc7f9341ecef51c2ed96a0f21b046f5a8d.

Change-Id: I2fdf1de21b6598f85bbd94acef44e771b2df9f42
 2014-06-05 19:02:47 +00:00
Elliott Hughes
406be84ed3 Merge "resolved conflicts for merge of f8272896 to master" 2014-06-05 18:40:50 +00:00
Selim Cinek
561d5aa8ac am 2d49b682: Merge "Fix PanelView over expanding behavior." into lmp-preview-dev 
* commit '2d49b682522cf8ec90bfd3e3fde468b44919ccae':
  Fix PanelView over expanding behavior.
 2014-06-05 18:38:49 +00:00
Elliott Hughes
2432912b35 resolved conflicts for merge of f8272896 to master 
Change-Id: I34a156bceb5dacd90c399c56c6f07d2a8e5c0c85
 2014-06-05 11:35:53 -07:00
Dan Sandler
71f507bbe9 Merge "Don't show private notifications if a secure lockscreen is merely occluded." into lmp-preview-dev 2014-06-05 18:35:49 +00: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
Elliott Hughes
f827289668 am bd1949a4: am b2842e72: Merge "[LP64] Fix access to MediaAlbumArt." 
* commit 'bd1949a4fbd6eb61e7a0a0f81d654a8df50999bf':
  [LP64] Fix access to MediaAlbumArt.
 2014-06-05 18:29:24 +00: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
Elliott Hughes
bd1949a4fb am b2842e72: Merge "[LP64] Fix access to MediaAlbumArt." 
* commit 'b2842e72819b3eb724503290e9eaa7c50f65e45b':
  [LP64] Fix access to MediaAlbumArt.
 2014-06-05 18:19:16 +00:00
Justin Koh
29dee1bbba am 2304bf4c: am 2be3d6f9: Merge "Add check to allow notification listener packages to post >50 notifications" into klp-modular-dev 
* commit '2304bf4cd4e377994d80f55871fd31f82bb4f646':
  Add check to allow notification listener packages to post >50 notifications
 2014-06-05 18:14:01 +00:00
Justin Koh
2304bf4cd4 am 2be3d6f9: Merge "Add check to allow notification listener packages to post >50 notifications" into klp-modular-dev 
* commit '2be3d6f9361311c1d272965afcd602ae12c769af':
  Add check to allow notification listener packages to post >50 notifications
 2014-06-05 18:10:01 +00:00
Justin Koh
2be3d6f936 Merge "Add check to allow notification listener packages to post >50 notifications" into klp-modular-dev 2014-06-05 18:06:46 +00:00
Jean-Michel Trivi
9f47b84c04 Merge "AudioAttributes: parcelable, hide support for tags" 2014-06-05 18:06:06 +00:00
Elliott Hughes
b2842e7281 Merge "[LP64] Fix access to MediaAlbumArt." 2014-06-05 18:02:04 +00:00
Raph Levien
6bfd7e7df3 Support for context in Minikin shaping 
This patch uses the Minikin's new doLayout API that supports context,
and has some simple refactoring (pass css as string rather than setting
on the Layout object) to use this api.

Change-Id: I899474f81d377f3106e95ee3eb8d0fcc44c23ac2
 2014-06-05 11:01:21 -07:00
Chris Wren
38f650818a am 413edd50: Merge "Disable the attention light on devices that do not have it." into lmp-preview-dev 
* commit '413edd50540a7890949c5370d18f293f2e6f8841':
  Disable the attention light on devices that do not have it.
 2014-06-05 18:00:02 +00:00
Raph Levien
e95b5850ac Support for scaleX and skewX in Minikin 
Passes textScaleX and textSkewX parameters, as well as paint flags from
the paint to Minikin, to support nontrivial scale and stretch of text.
Passing paint flags should minimize kerning artifacts arising from
mismatch of glyph rendering in layout and drawing.

Also, replaces unsafe snprintf to a fixed size buffer with a safe
version, which still avoids an allocation per layout operation.

This is part of the fix for bug 15186705 "Usability of the suggestion
strip in recent OTA's is severely reduced"

Change-Id: I79788383135836f4c21fb84405f36382627bf959
 2014-06-05 10:57:18 -07:00
Selim Cinek
03b62b3c7f Merge "Fix PanelView over expanding behavior." into lmp-preview-dev 2014-06-05 17:57:15 +00:00
Robin Lee
d450a3a995 am 7f993419: am 3c189e02: am 271251d7: Merge "Add Environment call: get config dir for some user" 
* commit '7f99341950273f5284186ea2e59a22ac71241c30':
  Add Environment call: get config dir for some user
 2014-06-05 17:56:58 +00:00
Jorim Jaggi
47c85a3525 Fix PanelView over expanding behavior. 
Fixes a bug that the panel height was wrongly calculated and lagging
one frame behind. Also fixes the animation when overscrolling and
then flinging the panel to collapse. In addition, the logic to handle
the over expanding is much cleaner and calculated in an absolut
manner (before, it was relative an really complicated to understand).

Bug: 14487435
Change-Id: If8dbb3e063ef63f51f6dac0ae5bf276480514103
 2014-06-05 19:54:42 +02:00
Robin Lee
7f99341950 am 3c189e02: am 271251d7: Merge "Add Environment call: get config dir for some user" 
* commit '3c189e02e42fba9d5be2c4f68f76620bae33618e':
  Add Environment call: get config dir for some user
 2014-06-05 17:53:25 +00:00
Hui Lu
1ce7f79ddd am 26f40cc3: am 61c0f547: Merge "Add interface name for proxy network type." into klp-modular-dev 
* commit '26f40cc36dc869fc8de3bf4c97de57aae0d626ca':
  Add interface name for proxy network type.
 2014-06-05 17:42:17 +00:00
Hui Lu
26f40cc36d am 61c0f547: Merge "Add interface name for proxy network type." into klp-modular-dev 
* commit '61c0f547339ec870d42b15e84f9628631308f22f':
  Add interface name for proxy network type.
 2014-06-05 17:39:09 +00:00
Elliott Hughes
9fa803be10 [LP64] Fix access to MediaAlbumArt. 
The mSize field is a uint32_t, not a long.

Change-Id: Id3b9e6049e8998840d33fa886b676db2a8022064
 2014-06-05 10:38:30 -07:00
Hui Lu
61c0f54733 Merge "Add interface name for proxy network type." into klp-modular-dev 2014-06-05 17:36:02 +00:00
Deepanshu Gupta
ad69aee5ed LayoutLib: Font variants 
Update to support font variants properly.

Change-Id: Iabe37babd9ddce80a9ba9eca7e0e5a0ffb090646
 2014-06-05 10:34:12 -07:00
Kenny Guy
8a4a1f2d80 Merge "Fix bug with sending intents to correct user for device admin." 2014-06-05 17:29:40 +00:00