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

158878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
47d9a58ce1 Merge "Fixing issue with old thumbnails on first launch of app. (Bug 18718114)" into lmp-mr1-dev 2014-12-11 21:20:42 +00:00
Joe Fernandez
817796940b am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs 
* commit 'c9014b6d59cae3602027a5ea373d436a7e78b71c':
  docs: studio basics haxm updates
 2014-12-11 20:55:53 +00:00
Ricardo Cervera
af7070e6f0 am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs 
* commit '64d97cb2ad6bfd10511067f178ba8a1ccf9ba452':
  docs: Fixes to watch faces docs.
 2014-12-11 20:55:49 +00:00
Rich Slogar
0564cee3c7 am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs 
* commit 'b490f297101bcf31f56278d21d5f56a5e5998a58':
  docs: studio bundle update
 2014-12-11 20:55:45 +00:00
Joe Fernandez
07877955be am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs 
* commit '5c518b7f01345a414cd260db7762bdb0aa73b55b':
  docs: platform updates for api 21
 2014-12-11 20:55:35 +00:00
Joe Fernandez
e3bac3bc8f am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs 
* commit 'b64545c83a526d17ccbce2d110a06f3789dd4ad8':
  docs: sdk tools 24.0.1 revisions
 2014-12-11 20:55:29 +00:00
Andrew Solovay
13e0a6505f am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes" 
* commit 'a97053fd0ba37feb7382fd30498a6a5e93c52a9e':
  docs: Added info about managed profiles to "Android 5.0 Changes"
 2014-12-11 20:55:23 +00:00
Winson Chung
0eae5573b5 Fixing issue with old thumbnails on first launch of app. (Bug 18718114) 
Ensure that we always update the thumbnail for the running task, in addition, we
need to be ignoring the running task when doing background preloading since it
will be invalidated anyways.

Change-Id: Ie4f9862dddc29aa71a44e94bbd036c7712487eed
 2014-12-11 12:24:41 -08:00
Joe Fernandez
c9014b6d59 am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs 
* commit 'ea500a3adf6bcf17ad22f05acd8c3220358f72ce':
  docs: studio basics haxm updates
 2014-12-11 19:59:00 +00:00
Joe Fernandez
ea500a3adf am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs 
* commit '0aa234457737cdb31538711251920aef3a70bb56':
  docs: studio basics haxm updates
 2014-12-11 19:50:39 +00:00
Ruben Brunk
f6ed526b3a Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev 2014-12-11 19:48:37 +00:00
Ricardo Cervera
64d97cb2ad am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs 
* commit '6621a4f6f9c63ff952c5e64a5ae1e41ef5ac5960':
  docs: Fixes to watch faces docs.
 2014-12-11 19:43:25 +00:00
Joe Fernandez
0aa2344577 Merge "docs: studio basics haxm updates" into lmp-docs 2014-12-11 19:43:18 +00:00
Ruben Brunk
433e715cc0 camera2: Fix LEGACY YUV production and orientation. 
Bug: 18486140
Change-Id: I119e57315b67d1f485bea7f1682bfc261ae0f934
 2014-12-11 11:35:46 -08:00
Ricardo Cervera
6621a4f6f9 am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs 
* commit '9fe34d9037dc27abb89c64ff75b87fdf9a4eaa8b':
  docs: Fixes to watch faces docs.
 2014-12-11 19:35:41 +00:00
Ricardo Cervera
9fe34d9037 Merge "docs: Fixes to watch faces docs." into lmp-docs 2014-12-11 19:28:41 +00:00
Jason Monk
7d8ccb41fa Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev 2014-12-11 19:22:20 +00:00
Rich Slogar
b490f29710 am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs 
* commit '5c853c26a879c411a98e1530247a41a856f7784c':
  docs: studio bundle update
 2014-12-11 19:17:05 +00:00
Rich Slogar
5c853c26a8 am d35216ad: Merge "docs: studio bundle update" into lmp-docs 
* commit 'd35216ad36aefb121167ad781b25f7a37d5c1e52':
  docs: studio bundle update
 2014-12-11 19:09:39 +00:00
Rich Slogar
d35216ad36 Merge "docs: studio bundle update" into lmp-docs 2014-12-11 19:04:03 +00:00
Rich Slogar
2f8f42f897 docs: studio bundle update 
Change-Id: I232a61ae6747b879e8a36f8e4942d6a3406c4162
 2014-12-11 10:51:41 -08:00
Amit Mahajan
c5da1d3ddf Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev 2014-12-11 18:39:23 +00:00
John Spurlock
0537caa1e0 Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev 2014-12-11 18:27:11 +00:00
Jason Monk
1206321f38 Fix crash in BluetoothControllerImpl 
Bug: 18717777
Change-Id: I396aa8b517054b1fd4c8fea7f0343f138cb261a7
 2014-12-11 13:26:01 -05:00
Rich Slogar
d282ba778b docs: studio basics haxm updates 
Change-Id: I2c3ef0dae3a091be27f1cfef13fe385f97781492
 2014-12-11 10:03:19 -08:00
John Spurlock
29b7872bf4 Zen: Leave zen=none on manual ringer mode stream volume changes. 
If the stream volume is changed from the api, leave zen=none
so as not to leave the system in an unexpected state.

Bug: 18084981
Change-Id: I857b3ff87ad4e2aa9aab479529caf13b819f854c
 2014-12-11 12:54:41 -05:00
Ricardo Cervera
ad69082b50 docs: Fixes to watch faces docs. 
Bug: 18705470
Bug: 18702859
Bug: 18713266

Change-Id: I67f159f3b54a03f08aa1cd4bf3aa40eec4a34631
 2014-12-11 09:17:45 -08:00
Robert Greenwalt
bde00a2b5c Merge "Add toString in NetworkFactory." into lmp-mr1-dev 2014-12-11 16:59:13 +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
15cd63027b Merge "Avoid tearing down process groups twice." into lmp-mr1-dev 2014-12-11 09:08:43 +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
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
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
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
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
Joe Fernandez
5c518b7f01 am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs 
* commit 'b32987ec2f8fbe887be4a6f4ed9a17f8e0a8cf22':
  docs: platform updates for api 21
 2014-12-11 00:45:20 +00:00
Joe Fernandez
b64545c83a am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs 
* commit '378c71a39187c333fd1be83a1b1d77e195ccdd2a':
  docs: sdk tools 24.0.1 revisions
 2014-12-11 00:37:10 +00:00
Andrew Solovay
a97053fd0b am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes" 
* commit 'f43c057ca611e9d86e365fd90eceec22cdaffac8':
  docs: Added info about managed profiles to "Android 5.0 Changes"
 2014-12-11 00:37:06 +00:00
Joe Fernandez
b32987ec2f am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs 
* commit 'c3daed967d5ad6b4df8547679c30c4d2efd005b3':
  docs: platform updates for api 21
 2014-12-11 00:36:53 +00:00
Joe Fernandez
c3daed967d Merge "docs: platform updates for api 21" into lmp-docs 2014-12-11 00:31:54 +00:00
Alan Viverette
daec594370 Fix build 
Change-Id: I2efdf2790aa768eaaa6e7e0b80a9ad7b2ddf3cb9
 2014-12-10 16:29:59 -08:00
Joe Fernandez
378c71a391 am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs 
* commit '235e4be4c92fbc68544f15bebcc6a92ab5d21183':
  docs: sdk tools 24.0.1 revisions
 2014-12-11 00:29:19 +00:00
Andrew Solovay
f43c057ca6 am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes" 
* commit 'c7ad6e9175e232416c22386b80f2c5c9b5031d81':
  docs: Added info about managed profiles to "Android 5.0 Changes"
 2014-12-11 00:29:14 +00:00