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

161739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
70cf2f72f2 am 7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev 
* commit '7d8ccb41fa3756839597cd28cd5710c1b690e17f':
  Fix crash in BluetoothControllerImpl
 2014-12-11 19:28:28 +00:00
Craig Mautner
cb17f18952 Don't apply animations to windows that are showing 
If a window is showing and not obscured by the keyguard, for
example windows on other displays, don't apply the enter animation.
This prevents jank on secondary displays when the keyguard is
unlocked.

Fixes bug 18689396

Change-Id: I2deb3030e6e887f57af9a5f1d42b1c71f06f7eeb
 2014-12-11 11:24:32 -08: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
cac8662943 am c5da1d3d: 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 
* commit 'c5da1d3ddfb4e0a8c17ee827765ba5ab7293c500':
  Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network.
 2014-12-11 18:43:38 +00: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
6f9a71729f am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev 
* commit '0537caa1e05a2f60e747559e5251f5771737c54f':
  Zen: Leave zen=none on manual ringer mode stream volume changes.
 2014-12-11 18:34:14 +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
Jorim Jaggi
43f4372c0a Fix low FPS when entering wifi/BT detail panel 
Bug: 18665311
Change-Id: If50db68ef3442fceb923ac0466878846c4071981
 2014-12-11 19:17:21 +01:00
Jorim Jaggi
8bc983efc4 Improve transition when going to Wifi/BT detail panel 
Animate the height change of the lower QS panel when going into
Wifi/BT or any other panel which is higher than the default size.

Bug: 18665311
Change-Id: Ic1d1f19183cf6b502d6b623388b315ed6e0a3c9f
 2014-12-11 19:16:50 +01: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
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
vandwalle
53d1f07073 make sure wificonfiguration scan cache doesnt grow unbounded 
Bug:18703749

Change-Id: I8e35d602a80b341668d9607db2da3ca6fdb970ae
 2014-12-11 02:58:44 -08:00
vandwalle
b713a7686e handle beacons reported with wrong RSSI value of 0 - Bug:18654243 
Change-Id: I7a387c930e70a7f99239389e6fd9d2b957cf3b00
 2014-12-11 02:58:44 -08: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
15cd63027b Merge "Avoid tearing down process groups twice." into lmp-mr1-dev 2014-12-11 09:08:43 +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
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
Adam Powell
35da41e6c3 Have ViewGroups without a parent clip child visible rects to bounds 
getChildVisibleRect was enhanced to obey the official contracts for
clipping children and clip to padding. Unfortunately this meant that
ViewGroups with no parent have no way of checking if they will be
clipped to their own bounds and therefore should clip a child rect.

Treat orphaned view subtrees as entities that clip to the root view
bounds to preserve prior CTS guarantees.

Bug 18642973

Change-Id: I9fcbeb0e92cd6715cd9184183d36889614ed0bed
 2014-12-10 18:59:34 -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
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
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
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