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

137184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Sollenberger
139088228f Update HWUI matrix API 
1. more closely mirror Skia API by using const ref instead of ptrs
2. store SkMatrix in the drawOp instead of the linear allocation heap

Change-Id: I4b9f6f76b9f7d19325e29303d27b793679fd4823
 2014-05-29 16:51:23 -04:00
Nicolas Prevot
1015efb143 Merge "Making the content resolver work with result intents." 2014-05-29 17:02:20 +00:00
Craig Mautner
88d4c398ea am cd461c00: (-s ours) Merge "Revert "Modify task navigation to return to recent tasks." DO NOT MERGE" into lmp-preview-dev 
* commit 'cd461c00f737cd9f843254e1aa2c7345164909a3':
  Revert "Modify task navigation to return to recent tasks." DO NOT MERGE
 2014-05-29 16:56:13 +00:00
Craig Mautner
7a18498559 am b5b37c2b: Merge "Add methods to coordinate unlock animation." into lmp-preview-dev 
* commit 'b5b37c2babe744acb002ed9b8556a9d9cd2202fc':
  Add methods to coordinate unlock animation.
 2014-05-29 16:52:13 +00:00
Craig Mautner
71ac80c46a Merge "Revert "Modify task navigation to return to recent tasks." DO NOT MERGE" into lmp-preview-dev 2014-05-29 16:51:24 +00:00
Craig Mautner
b9a6c8ad99 Revert "Modify task navigation to return to recent tasks." DO NOT MERGE 
This reverts commit 1a4e211e03f1f795d935058e27356a0e8bc5df7c.

Change-Id: Ia691b93347c7eb2395933e5a5ba385ea94e08d6f
 2014-05-29 16:50:59 +00:00
Craig Mautner
fdaaf91f35 Merge "Revert "Modify task navigation to return to recent tasks."" 2014-05-29 16:50:11 +00:00
Craig Mautner
719e621186 Revert "Modify task navigation to return to recent tasks." 
This reverts commit 19174878e25ebfd8806595f83df7bdea1d239c07.

Change-Id: I98db2c9aa975495c5828b3d16b8b45f515e6a5fa
 2014-05-29 16:49:41 +00:00
Craig Mautner
219d7a50fb Merge "Add methods to coordinate unlock animation." into lmp-preview-dev 2014-05-29 16:45:36 +00:00
Paul Lawrence
f5152735b5 am 8a518d92: (-s ours) Merge "DO NOT MERGE: Hide crypto consts from docs" into lmp-preview-dev 
* commit '8a518d9233c4351e2b90252156bb5bc3a7a140e1':
  DO NOT MERGE: Hide crypto consts from docs
 2014-05-29 16:12:24 +00:00
Paul Lawrence
575510c48f Merge "DO NOT MERGE: Hide crypto consts from docs" into lmp-preview-dev 2014-05-29 16:07:27 +00:00
Paul Lawrence
fab7cbc9ce DO NOT MERGE: Hide crypto consts from docs 
@bug 15192967

Change-Id: I134b2cb2d2841bc101e63a8a4dbd86f7b7bdca14
(cherry picked from commit 81ab14fb19a2669aa54c1a333c807c22d5c41a8e)
 2014-05-29 16:03:43 +00:00
Dan Sandler
1811efdcc2 am afad5df6: Merge "Use DecorToolbar.getViewGroup() to get the view properly." into lmp-preview-dev 
* commit 'afad5df6425c2e6682b203e3e075e70ef56df9d0':
  Use DecorToolbar.getViewGroup() to get the view properly.
 2014-05-29 15:57:53 +00:00
Dan Sandler
5ec96a201e Merge "Use DecorToolbar.getViewGroup() to get the view properly." into lmp-preview-dev 2014-05-29 15:53:03 +00:00
Deepanshu Gupta
f100bc4e9f am 4a0e3c7c: (-s ours) Merge "Recurse into directories to find fonts. [DO NOT MERGE]" into lmp-preview-dev 
* commit '4a0e3c7c9ef18ab0451922c4e2743eff659a7582':
  Recurse into directories to find fonts. [DO NOT MERGE]
 2014-05-29 15:43:15 +00:00
Deepanshu Gupta
5390ba1da1 am 70d0c48b: (-s ours) Merge "Parallel processing of the fonts. [DO NOT MERGE]" into lmp-preview-dev 
* commit '70d0c48babd5b117bf705dd271db9e2f8bc0450b':
  Parallel processing of the fonts. [DO NOT MERGE]
 2014-05-29 15:43:06 +00:00
Deepanshu Gupta
cf6aac168f am 36dbe009: (-s ours) Merge "Add multiple dir support to build_font.py [DO NOT MERGE]" into lmp-preview-dev 
* commit '36dbe009bf7ad448c4aeb18f6a74fcf97d49f3d9':
  Add multiple dir support to build_font.py [DO NOT MERGE]
 2014-05-29 15:42:51 +00:00
Deepanshu Gupta
c2f8b30efc am a046f4d1: Merge "Layoutlib: Fix FontFamily_Delegate use after unref" into lmp-preview-dev 
* commit 'a046f4d1ee7bff98dfe94dc52539c88dfd290647':
  Layoutlib: Fix FontFamily_Delegate use after unref
 2014-05-29 15:42:46 +00:00
Deepanshu Gupta
151131a3c0 am f9b3f3c5: Merge "Update delegates" into lmp-preview-dev 
* commit 'f9b3f3c5844de42d0a15475ae430317e661d5fc5':
  Update delegates
 2014-05-29 15:42:41 +00:00
Deepanshu Gupta
85c69944bd Merge "Recurse into directories to find fonts. [DO NOT MERGE]" into lmp-preview-dev 2014-05-29 15:38:17 +00:00
Deepanshu Gupta
f251b06089 Merge "Parallel processing of the fonts. [DO NOT MERGE]" into lmp-preview-dev 2014-05-29 15:37:55 +00:00
Deepanshu Gupta
28b13b2332 Merge "Add multiple dir support to build_font.py [DO NOT MERGE]" into lmp-preview-dev 2014-05-29 15:37:45 +00:00
Deepanshu Gupta
2cb50d45a8 Merge "Layoutlib: Fix FontFamily_Delegate use after unref" into lmp-preview-dev 2014-05-29 15:37:24 +00:00
Deepanshu Gupta
1a5b0de877 Merge "Update delegates" into lmp-preview-dev 2014-05-29 15:37:07 +00:00
Griff Hazen
2be1740884 am 50db238f: (-s ours) Merge "DO NOT MERGE Cherry-pick: Additional doc fixes for WearableExtender" into lmp-preview-dev 
* commit '50db238f71cbbefc2340503d2f93c73111d837ba':
  DO NOT MERGE Cherry-pick: Additional doc fixes for WearableExtender
 2014-05-29 15:20:55 +00:00
Robert Greenwalt
3b95b2fa7a am 67cf4bad: Merge "Don\'t break things if a network goes back to CONNECTED." into lmp-preview-dev 
* commit '67cf4bad7bad05ff0a3a0704305c9eed4c92a338':
  Don't break things if a network goes back to CONNECTED.
 2014-05-29 15:20:50 +00:00
Griff Hazen
6326ef4dd5 Merge "DO NOT MERGE Cherry-pick: Additional doc fixes for WearableExtender" into lmp-preview-dev 2014-05-29 15:17:26 +00:00
Robert Greenwalt
33051471cf Merge "Don't break things if a network goes back to CONNECTED." into lmp-preview-dev 2014-05-29 15:15:14 +00:00
Dan Sandler
6fdeeb34ae Use DecorToolbar.getViewGroup() to get the view properly. 
Bug: 15320825
Change-Id: Ib7e162c816fadf2b5c83af1326e7158f6bd69c8e
 2014-05-29 11:02:41 -04:00
Paul Lawrence
b6102427ae Merge "Hide crypto consts from docs" 2014-05-29 14:43:09 +00:00
Yorke Lee
547d9b9b55 Merge "Unhide ContactsCount API" 2014-05-29 14:35:53 +00:00
John Spurlock
c19a72c447 am 499f4a0a: VolumeZen: Don\'t clear stream type if embedded. 
* commit '499f4a0a4df37558801a712a24daebb91df0b327':
  VolumeZen: Don't clear stream type if embedded.
 2014-05-29 14:23:21 +00:00
John Spurlock
f71205c1ee VolumeZen: Don't clear stream type if embedded. 
Clearing the stream type makes sense if the volume panel is
in dialog mode, but not when embedded.

Bug:15186070
Change-Id: Ice5f547ef987e28ef51050faef682c5dfa5f7604
 2014-05-29 10:19:14 -04:00
John Spurlock
46023ace23 am cd41eb63: QuickSettings: Basic content-resizing for detail panel. 
* commit 'cd41eb6385590fadf63ce1b24cc5bf562f66a305':
  QuickSettings: Basic content-resizing for detail panel.
 2014-05-29 13:05:26 +00:00
Nicolas Prevot
a422a07d29 Merge "Small fix related to Cross-profile intents." 2014-05-29 12:58:39 +00:00
John Spurlock
2684d5e7d7 QuickSettings: Basic content-resizing for detail panel. 
Also remove toggle from zen tile + fix bottom padding.

Bug:15315490
Change-Id: Ib839b9280ce60d2f51e4c0c46e41a7743e7ec8f6
 2014-05-29 08:49:41 -04:00
Lorenzo Colitti
bce0106c41 Don't break things if a network goes back to CONNECTED. 
Currently, if a network goes from CONNECTED to some other "live"
state (e.g., CONNECTING, because it's VERIFYING_POOR_LINK) and
back, ConnectivityService treats it as if a new network had
connected.  This causes it to attempt to create the network
(which fails, since a network with that netid already exists), to
trigger verification, and if the verification succeeds, to tear
down the network because the request it's satisfying is already
satisfied by the network itself.

Instead, if creating the network fails, assume it's because the
network had already been created, and bail out.

Also, when validation completes, ignore NetworkRequests that were
being served by the same NetworkAgent as before.

Bug: 15244052

(cherry picked from commit cfff026ec47afc7e31f60f80e3deea7f4e2f9be5)

Change-Id: I52c2220e8f1d98fca765880be3040593e92722ed
 2014-05-29 21:36:07 +09:00
Lorenzo Colitti
adbb17906e Merge "Don't break things if a network goes back to CONNECTED." 2014-05-29 12:25:46 +00:00
Nicolas Prevot
ad0634c50c Small fix related to Cross-profile intents. 
Change-Id: Id4cadd051c337776451ed807a2edac6d869b372a
 2014-05-29 13:11:31 +01:00
Nicolas Prevot
c6cf95c0f5 Making the content resolver work with result intents. 
prepareToLeaveUser is called if necessary on result intents.
Adding the targetUserId to grantUriPermissionFromIntentLocked
This allows the GET_CONTENT intent to work across profiles.

Change-Id: Id81280c23247aeda7ad56e34af9b12a6f3a00a3c
 2014-05-29 11:30:36 +01:00
Lorenzo Colitti
51ed158a94 Don't break things if a network goes back to CONNECTED. 
Currently, if a network goes from CONNECTED to some other "live"
state (e.g., CONNECTING, because it's VERIFYING_POOR_LINK) and
back, ConnectivityService treats it as if a new network had
connected.  This causes it to attempt to create the network
(which fails, since a network with that netid already exists), to
trigger verification, and if the verification succeeds, to tear
down the network because the request it's satisfying is already
satisfied by the network itself.

Instead, if creating the network fails, assume it's because the
network had already been created, and bail out.

Also, when validation completes, ignore NetworkRequests that were
being served by the same NetworkAgent as before.

Bug: 15244052
Change-Id: Ifd73558e5be452d9ef88c64cca429d5f302bf354
 2014-05-29 19:19:54 +09:00
Wink Saville
e58d180bf6 am 5d3c9616: am 52b41462: am 9cd3ff7d: Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change." 
* commit '5d3c96168d3a16c860d9862167097f7d6e66a0fc':
  Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change.
 2014-05-29 10:02:17 +00:00
Wink Saville
5d3c96168d am 52b41462: am 9cd3ff7d: Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change." 
* commit '52b4146273ea29f6d1ed89e4de79f2d7ff0d71dc':
  Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change.
 2014-05-29 09:56:24 +00:00
Xavier Ducrohet
de5637b9ec am ec9aa23e: Merge "Stopgap fix for layoutlib." into lmp-preview-dev 
* commit 'ec9aa23e1e214c9359e38205495db225560c2753':
  Stopgap fix for layoutlib.
 2014-05-29 09:43:33 +00:00
Brian Carlstrom
30c624c49c am 1240221a: Tracking ActionBarView change 1181f77bdfaa7bf8a8250cdd13c7b7a1d6ee0c44 
* commit '1240221ac9cdc70ce2c79fcc48628d277e00354d':
  Tracking ActionBarView change 1181f77bdfaa7bf8a8250cdd13c7b7a1d6ee0c44
 2014-05-29 09:43:28 +00:00
Brian Carlstrom
4f9c216448 am da1d4828: Tracking IWindowManager change 2ea3814083f27567ae07a1b449da3d596dd4d9d5 
* commit 'da1d48285f2fc992de691a5abaf7c651a86201a2':
  Tracking IWindowManager change 2ea3814083f27567ae07a1b449da3d596dd4d9d5
 2014-05-29 09:43:23 +00:00
Christopher Tate
12eefc9f00 am 45ebf5d1: Merge "Widget restore documentation tweaks" into lmp-preview-dev 
* commit '45ebf5d19b6fc410eaafe1804f265503f585f682':
  Widget restore documentation tweaks
 2014-05-29 09:43:13 +00:00
Selim Cinek
bdcfd05418 am 61ba6af8: Merge "Fixed a bug where the user was unable to pull down statusbar." into lmp-preview-dev 
* commit '61ba6af8ac1b3b613342cbd522b7aa2e11aba8cb':
  Fixed a bug where the user was unable to pull down statusbar.
 2014-05-29 09:43:03 +00:00
Dianne Hackborn
d3a5b916b1 am c2091a1f: Merge "Add system layer for voice interaction services." into lmp-preview-dev 
* commit 'c2091a1fbc463941b3e42db36e369124ac3c1013':
  Add system layer for voice interaction services.
 2014-05-29 09:42:56 +00:00
Christoph Studer
5a2d76c176 am 8fed3095: Merge "SysUI: Fix bug where ZEN notification icon was shown" into lmp-preview-dev 
* commit '8fed3095b2b2342ebf59636b94e68b62ca16fd0d':
  SysUI: Fix bug where ZEN notification icon was shown
 2014-05-29 09:42:44 +00:00