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

171454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
46765a0fbc am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev 
automerge: 911bcea

* commit '911bceab1ead02fde9ccb6fe2651fee13aca817e':
  Add toString in NetworkFactory.
 2014-12-11 18:07:53 +00:00
Selim Cinek
a34913f572 Merge "Fixed a bug where the pattern may become invisible" into lmp-mr1-dev automerge: f8dc9d7 
automerge: efa38cd

* commit 'efa38cd36101d7469e8ed4db03cdebe818bbcfd2':
  Fixed a bug where the pattern may become invisible
 2014-12-11 18:05:37 +00:00
Selim Cinek
58fc8db68e Merge "Fixed a bug where the empty shade and dismiss views would animate" into lmp-mr1-dev automerge: 372eb38 
automerge: 7988ef9

* commit '7988ef9c4da50f007fde71a121f89e6b9796c69e':
  Fixed a bug where the empty shade and dismiss views would animate
 2014-12-11 18:04:17 +00:00
Selim Cinek
7a5409fe63 Merge "Fixed a bug where the background could become transparent" into lmp-mr1-dev automerge: 8f51c4c 
automerge: 2e34adc

* commit '2e34adc24c9609426d08530b1c5bbec723bd4a19':
  Fixed a bug where the background could become transparent
 2014-12-11 18:02:39 +00:00
Narayan Kamath
0b0b13b93f am 15cd6302: Merge "Avoid tearing down process groups twice." into lmp-mr1-dev 
automerge: 6fe0fd6

* commit '6fe0fd69a1da7c0f548bcda91827d2a9e493c555':
  Avoid tearing down process groups twice.
 2014-12-11 18:00:47 +00:00
Robert Greenwalt
911bceab1e am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev 
* commit 'bde00a2b5c8c506b79e0724021a0711bde207c25':
  Add toString in NetworkFactory.
 2014-12-11 17:03:57 +00:00
Robert Greenwalt
bde00a2b5c Merge "Add toString in NetworkFactory." into lmp-mr1-dev 2014-12-11 16:59:13 +00:00
Selim Cinek
efa38cd361 Merge "Fixed a bug where the pattern may become invisible" into lmp-mr1-dev 
automerge: f8dc9d7

* commit 'f8dc9d7b3d496593c6c6dddcd42cae13ac508876':
  Fixed a bug where the pattern may become invisible
 2014-12-11 15:12:37 +00:00
Selim Cinek
7988ef9c4d Merge "Fixed a bug where the empty shade and dismiss views would animate" into lmp-mr1-dev 
automerge: 372eb38

* commit '372eb38c17b8bcd304985d7a36168c175f625016':
  Fixed a bug where the empty shade and dismiss views would animate
 2014-12-11 15:11:17 +00:00
Selim Cinek
2e34adc24c Merge "Fixed a bug where the background could become transparent" into lmp-mr1-dev 
automerge: 8f51c4c

* commit '8f51c4c5e51e1581ba9892bc095453b8fc315f7b':
  Fixed a bug where the background could become transparent
 2014-12-11 15:10:06 +00:00
Selim Cinek
f8dc9d7b3d Merge "Fixed a bug where the pattern may become invisible" into lmp-mr1-dev 2014-12-11 14:09:44 +00:00
Selim Cinek
372eb38c17 Merge "Fixed a bug where the empty shade and dismiss views would animate" into lmp-mr1-dev 2014-12-11 14:09:00 +00:00
Selim Cinek
8f51c4c5e5 Merge "Fixed a bug where the background could become transparent" into lmp-mr1-dev 2014-12-11 14:08:10 +00:00
Narayan Kamath
0602404725 am bc59ca4b: am 31462128: Merge "Avoid tearing down process groups twice." 
* commit 'bc59ca4bdbd993c1eb5c2a74f9b35857619da285':
  Avoid tearing down process groups twice.
 2014-12-11 10:35:28 +00:00
Narayan Kamath
c1c4edf129 am 37da3f0d: am 7bd28de5: Merge "Remove some crufty "core" tests." 
* commit '37da3f0d28815a5dfbea929fc173d89cb62bd318':
  Remove some crufty "core" tests.
 2014-12-11 10:35:19 +00:00
Narayan Kamath
6fe0fd69a1 am 15cd6302: Merge "Avoid tearing down process groups twice." into lmp-mr1-dev 
* commit '15cd63027bc8413659114714068a665869a4b3b2':
  Avoid tearing down process groups twice.
 2014-12-11 10:34:09 +00:00
Narayan Kamath
bc59ca4bdb am 31462128: Merge "Avoid tearing down process groups twice." 
* commit '314621287801ba4c71467aad4702114eeb4d9951':
  Avoid tearing down process groups twice.
 2014-12-11 10:28:10 +00:00
Narayan Kamath
37da3f0d28 am 7bd28de5: Merge "Remove some crufty "core" tests." 
* commit '7bd28de5781293b1b2b4224762bd909d097adbda':
  Remove some crufty "core" tests.
 2014-12-11 10:28:04 +00:00
Narayan Kamath
3146212878 Merge "Avoid tearing down process groups twice." 2014-12-11 09:15:06 +00:00
Narayan Kamath
7bd28de578 Merge "Remove some crufty "core" tests." 2014-12-11 09:14:15 +00:00
Narayan Kamath
15cd63027b Merge "Avoid tearing down process groups twice." into lmp-mr1-dev 2014-12-11 09:08:43 +00:00
Paul Jensen
8f58207319 am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev 
automerge: d9d48cc

* commit 'd9d48cc9c7ab0d1590918e199917968eafc48288':
  Fix several HTTP proxy issues with multinetworking.
 2014-12-11 05:49:18 +00:00
Pavel Zhamaitsiak
de6714474d am fda0ff02: Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev 
automerge: b07de8d

* commit 'b07de8d172e7c7b663dec0dd14f7d6dba168aa4c':
  Add missing member to string conversion - helps in debugging.
 2014-12-11 05:47:45 +00:00
Paul Jensen
d9d48cc9c7 am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev 
* commit '2122e14cca3edc5099b90d8768b34d7a0e9fe148':
  Fix several HTTP proxy issues with multinetworking.
 2014-12-11 04:55:52 +00:00
Pavel Zhamaitsiak
b07de8d172 am fda0ff02: Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev 
* commit 'fda0ff020d2ce63e4010e24d5f4bebf7fbe026c5':
  Add missing member to string conversion - helps in debugging.
 2014-12-11 04:55:47 +00:00
Paul Jensen
2122e14cca Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev 2014-12-11 04:51:16 +00:00
Pavel Zhamaitsiak
fda0ff020d Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev 2014-12-11 04:47:20 +00:00
vandwalle
dca701a8fa am b897f013: Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev 
automerge: 76dc7a1

* commit '76dc7a1abe2d69013dbc8238292d239ac1287e2c':
  adjust network switching thresholds Bug:18589301
 2014-12-11 03:41:48 +00:00
smain@google.com
c73a65d618 am 9a6d1d9f: am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs automerge: e04a9fc 
automerge: bac113b

* commit 'bac113bbcbe7780ca658f09019e5118ec851cd07':
  add helpouts widget to wave 3 pages
 2014-12-11 03:39:57 +00:00
Luan Nguyen
f5b865101d am 25964a85: am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index. automerge: 75ec24e 
automerge: 8470943

* commit '847094397ebac9ab2c5bb7e11844fd2b533bd209':
  docs: Fix link for moved Android Studio index.
 2014-12-11 03:38:41 +00:00
vandwalle
76dc7a1abe am b897f013: Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev 
* commit 'b897f013b558596964e33b39c0e9678998c281dc':
  adjust network switching thresholds Bug:18589301
 2014-12-11 03:25:00 +00:00
vandwalle
b897f013b5 Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev 2014-12-11 03:18:42 +00:00
Robert Greenwalt
6b746b5e14 Add toString in NetworkFactory. 
Needed some additional logging to track down this bug
so add toString to capture the state.

bug:18569575
Change-Id: I4047b8f8797bac09bcff31e99d9cb117abb04df4
 2014-12-10 19:04:50 -08:00
smain@google.com
bac113bbcb am 9a6d1d9f: am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs automerge: e04a9fc 
* commit '9a6d1d9fba9f32bd7d7f215637c4ae932d550f57':
  add helpouts widget to wave 3 pages
 2014-12-11 03:04:20 +00:00
Luan Nguyen
847094397e am 25964a85: am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index. automerge: 75ec24e 
* commit '25964a854a0f41a74136c7dbc1c459ba6ef0e20b':
  docs: Fix link for moved Android Studio index.
 2014-12-11 03:04:14 +00:00
smain@google.com
9a6d1d9fba am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs 
automerge: e04a9fc

* commit 'e04a9fcc2edc4b2527c8233e16f823cec6fb58cc':
  add helpouts widget to wave 3 pages
 2014-12-11 02:56:17 +00:00
Luan Nguyen
25964a854a am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index. 
automerge: 75ec24e

* commit '75ec24e26900fa6e0def1f5e946be41614d8e520':
  docs: Fix link for moved Android Studio index.
 2014-12-11 02:54:57 +00:00
Dianne Hackborn
b56e98da8b am 84adc43a: Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev 
automerge: 0f050ea

* commit '0f050ea40204242387eac8f7f5949ea16c143515':
  Fix issue #18706195: Improve label names of memory types
 2014-12-11 02:10:23 +00:00
Dianne Hackborn
0f050ea402 am 84adc43a: Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev 
* commit '84adc43a70302278eea4d9c198e14c88d6432f9c':
  Fix issue #18706195: Improve label names of memory types
 2014-12-11 02:05:11 +00:00
Dianne Hackborn
84adc43a70 Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev 2014-12-11 01:58:51 +00:00
John Reck
d67bb5015f am eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-dev 
automerge: e4a6ed9

* commit 'e4a6ed9d6d8721c9fad018b0d43dfe7daf4b24e7':
  Don't preload textures for AssetAtlas
 2014-12-11 01:25:54 +00:00
John Reck
e4a6ed9d6d am eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-dev 
* commit 'eb2dcc791e649e07ec8114e00752b54965c46e65':
  Don't preload textures for AssetAtlas
 2014-12-11 01:23:06 +00:00
John Reck
eb2dcc791e Merge "Don't preload textures for AssetAtlas" into lmp-mr1-dev 2014-12-11 01:12:31 +00:00
John Reck
ebd52610cf Don't preload textures for AssetAtlas 
Bug: 18317479

RenderNode::prepareSubTree calls prefetchAndMarkInUse
on every bitmapResoruce in the DisplayList. However,
this resulted in textures being uploaded for bitmaps
that would be drawn from the AssetAtlas instead.

To fix this we teach TextureCache about the AssetAtlas
so that calls to TextureCache return the Texture from
AssetAtlas if it exists. Thus usage of AssetAtlas
is now purely to allow for further optimizations via
draw merging instead of a requirement to get
any benefit at all.

Change-Id: I65282fa05bac46f4e93822b3467ffa0261ccf200
 2014-12-10 17:07:41 -08:00
Dianne Hackborn
1353df5655 Fix issue #18706195: Improve label names of memory types 
Change-Id: Ia11153300e04aecd56baca9d4316ac362688d594
 2014-12-10 16:54:13 -08:00
Alan Viverette
934d8d85be am daec5943: Fix build 
automerge: aaf2e19

* commit 'aaf2e190d363f5934e5bc2fd3293d41aa9ac00aa':
  Fix build
 2014-12-11 00:37:51 +00:00
Alan Viverette
aaf2e190d3 am daec5943: Fix build 
* commit 'daec594370f0e47bf07d0c9c968e3c5dfedf0bb5':
  Fix build
 2014-12-11 00:36:19 +00:00
Alan Viverette
7d0aed2d2c am 4e137437: Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev 
automerge: c211857

* commit 'c211857af37eabb6073fa2ac402c9f7de9548822':
  Update tint filter after setting gradient drawable state
 2014-12-11 00:32:53 +00:00
Alan Viverette
daec594370 Fix build 
Change-Id: I2efdf2790aa768eaaa6e7e0b80a9ad7b2ddf3cb9
 2014-12-10 16:29:59 -08:00
Alan Viverette
c211857af3 am 4e137437: Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev 
* commit '4e1374378d41f15cefc1f5889fd4d549461485ff':
  Update tint filter after setting gradient drawable state
 2014-12-11 00:29:51 +00:00