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

177873 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yohann Roussel
59cf734f9e resolved conflicts for merge of d67bb501 to master 
Change-Id: I40698ce1e382cb41eec7af5ea49ac0e2f997d555
 2014-12-11 11:10:50 +01:00
Alan Viverette
9f2d0d27ac am 934d8d85: am daec5943: Fix build automerge: aaf2e19 
* commit '934d8d85be221b86cb5097625c0f48391b3a71b2':
  Fix build
 2014-12-11 01:40:26 +00:00
Alan Viverette
6a9fb4b6dd am 7d0aed2d: am 4e137437: Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev automerge: c211857 
* commit '7d0aed2d2c0c2fd4bcaa0e786efd6134ae162d07':
  Update tint filter after setting gradient drawable state
 2014-12-11 01:40:17 +00:00
Winson Chung
e9a8205b5d am 4e4fd0f7: am e405e59e: Merge "Fixing major regressions in Recents with multi-user. (Bug 18574950)" into lmp-mr1-dev automerge: b485445 
* commit '4e4fd0f7216cefa9a7e010625bd5b2375277bcdc':
  Fixing major regressions in Recents with multi-user. (Bug 18574950)
 2014-12-11 01:40:10 +00:00
Shishir Agrawal
f864e44901 am 23172c70: am 960dcceb: Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev automerge: 951dcdd 
* commit '23172c706b0422ec2cc5bb9e1988a3bd2944a257':
  Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
 2014-12-11 01:39:54 +00:00
Amith Yamasani
ac3c4e0c6c am 2467188e: am a2530e4a: am ee24d848: Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev 
* commit '2467188e396503988ea05401011837a18f9a93a1':
  Stop guest user on exiting, to conserve resources
 2014-12-11 01:39:49 +00:00
Dmitriy Ivanov
39dcc579ff am c4e52d0e: resolve merge conflicts of 2b0f2db to lmp-mr1-dev-plus-aosp. 
* commit 'c4e52d0ed9191be509d0bcabed3fcaeb42138be1':
  Switch to libsigchain.a
 2014-12-11 01:39:45 +00:00
Dmitriy Ivanov
22fcfcd079 am c627d61f: Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 
* commit 'c627d61f2978d8e76ed8c9cc072884b8fe1a565b':
 2014-12-11 01:38:53 +00:00
Alan Viverette
302ce540a0 am 9e8fbe42: am 7171bf40: am 6c42ee47: Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev 
* commit '9e8fbe42e96180f99fb2e2c4eccaa0441eb89b75':
  Always call onDateChanged() when the date picker selection changes
 2014-12-11 01:38:48 +00:00
Dianne Hackborn
0a167c87b4 am 5e0550f4: am dc1e9f48: am e207ffe0: Merge "Fix issue #18683980: questions on LMK memory changes" into lmp-mr1-dev 
* commit '5e0550f48e73490e84ef2c5acdf266c7814c1294':
  Fix issue #18683980: questions on LMK memory changes
 2014-12-11 01:38:43 +00:00
Alan Viverette
d8d9cbe3ff am 1259ab3a: am 3d517a70: am 62b780e8: Avoid creating futures for drawables with no constant state 
* commit '1259ab3a881adb008b74e5ad81c84e088f674cf6':
  Avoid creating futures for drawables with no constant state
 2014-12-11 01:38:38 +00:00
Adam Lesinski
a76db13fb0 am 347040cf: am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev 
* commit '347040cf84401601b0d5cbb1d76e4648d1c8a461':
  Fix issue where non-resource attributes would cause obtainStyleAttributes to fail
 2014-12-11 01:38:33 +00:00
Jason Monk
227ce43d43 am a349a9e7: am 65c08ec8: am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev 
* commit 'a349a9e71aecf93d7d6d7d3e0d93d3e06291a519':
 2014-12-11 01:38:27 +00:00
Jason Monk
ccec890f49 am 3b4ccabc: am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev automerge: 65c08ec 
* commit '3b4ccabc06578a70adb2c0c748ded0410b26a763':
  Handle policy change while keyguard disabled
 2014-12-11 01:38:16 +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
Chris Craik
e2831a181f resolved conflicts for merge of 5369b769 to master 
Change-Id: Iccb2ce948321534e05d67e64dc40a38332adb1a7
 2014-12-10 17:05:43 -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
Winson Chung
4e4fd0f721 am e405e59e: Merge "Fixing major regressions in Recents with multi-user. (Bug 18574950)" into lmp-mr1-dev 
automerge: b485445

* commit 'b4854456c0e9092900a6432eb90d7c552c029070':
  Fixing major regressions in Recents with multi-user. (Bug 18574950)
 2014-12-11 00:28:57 +00:00
Shishir Agrawal
23172c706b am 960dcceb: Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev automerge: 951dcdd 
* commit '960dccebf576d53059fd7d026cdd1b81fb0b5974':
  Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
 2014-12-11 00:24:33 +00:00
Amith Yamasani
2467188e39 am a2530e4a: am ee24d848: Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev 
* commit 'a2530e4aa4c35787516ffea8368c0ebc35da4df4':
  Stop guest user on exiting, to conserve resources
 2014-12-11 00:24:26 +00:00
Alan Viverette
4e1374378d Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev 2014-12-11 00:23:33 +00:00
Dmitriy Ivanov
c4e52d0ed9 resolve merge conflicts of 2b0f2db to lmp-mr1-dev-plus-aosp. 
Change-Id: I5cbcf74319afc3ae9d0e9280b572a59286565de8
 2014-12-10 16:22:00 -08:00
Dmitriy Ivanov
c627d61f29 Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 2014-12-11 00:07:50 +00:00
Alan Viverette
9e8fbe42e9 am 7171bf40: am 6c42ee47: Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev 
* commit '7171bf40eca7dc0a044f0378082d7f7c1dfa2348':
  Always call onDateChanged() when the date picker selection changes
 2014-12-11 00:07:32 +00:00
Dianne Hackborn
5e0550f48e am dc1e9f48: am e207ffe0: Merge "Fix issue #18683980: questions on LMK memory changes" into lmp-mr1-dev 
* commit 'dc1e9f4813c61354f7e7459708684e4241b12e90':
  Fix issue #18683980: questions on LMK memory changes
 2014-12-11 00:07:26 +00:00
Alan Viverette
1259ab3a88 am 3d517a70: am 62b780e8: Avoid creating futures for drawables with no constant state 
* commit '3d517a701cb583f59ed8deefd21ab854c3890065':
  Avoid creating futures for drawables with no constant state
 2014-12-11 00:07:20 +00:00
Adam Lesinski
347040cf84 am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev 
* commit '740acf213c56c406132294790fa2fadd0380cfa7':
  Fix issue where non-resource attributes would cause obtainStyleAttributes to fail
 2014-12-11 00:07:02 +00:00
Jason Monk
a349a9e71a am 65c08ec8: am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev 
* commit '65c08ec82a11eeb2ea8b048935ddafc694fc0236':
  Handle policy change while keyguard disabled
 2014-12-11 00:06:53 +00:00
Jason Monk
3b4ccabc06 am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev 
automerge: 65c08ec

* commit '65c08ec82a11eeb2ea8b048935ddafc694fc0236':
  Handle policy change while keyguard disabled
 2014-12-11 00:06:21 +00:00
Winson Chung
b4854456c0 am e405e59e: Merge "Fixing major regressions in Recents with multi-user. (Bug 18574950)" into lmp-mr1-dev 
* commit 'e405e59e5b10aaf64c5f10e1336f43e092ce390b':
  Fixing major regressions in Recents with multi-user. (Bug 18574950)
 2014-12-11 00:03:21 +00:00
Alan Viverette
3ad771b384 Update tint filter after setting gradient drawable state 
BUG: 18706381
Change-Id: I7d664303c9b796243da6c55d1ea9482736aabf07
 2014-12-10 16:00:43 -08:00
Winson Chung
e405e59e5b Merge "Fixing major regressions in Recents with multi-user. (Bug 18574950)" into lmp-mr1-dev 2014-12-10 23:54:40 +00:00
Shishir Agrawal
960dccebf5 Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev 
automerge: 951dcdd

* commit '951dcdd9404054f6b7e794b18aad6f50e44732f9':
  Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
 2014-12-10 23:36:24 +00:00
Chris Craik
5369b76963 resolve merge conflicts of ed211b9 to lmp-mr1-dev-plus-aosp. 
Change-Id: Ib9d6d301282bbaae6b23b9ce07b9e6a4e9075991
 2014-12-10 15:23:54 -08:00
Shishir Agrawal
951dcdd940 Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev 2014-12-10 23:19:16 +00:00
Amith Yamasani
a2530e4aa4 am ee24d848: Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev 
* commit 'ee24d848a5f270fb2d18150ab14200e62c9fd118':
  Stop guest user on exiting, to conserve resources
 2014-12-10 23:18:26 +00:00
Winson Chung
2002cf5b46 Fixing major regressions in Recents with multi-user. (Bug 18574950) 
In the process of front-loading a lot of the loading work, we moved logic
into AlternateRecentsComponent, which is not multi-user friendly.  This CL 
proxies all the necessary events for non-primary users to their own SystemUI 
process to ensure that they handle them correctly, and proxies visibility
changes back to the primary user (since that is the only process with the
right callbacks).

Change-Id: I9fed92214ac4d4e2309ad6ffc35d09b5726c2880
 2014-12-10 15:16:55 -08:00
Amith Yamasani
ee24d848a5 Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev 2014-12-10 22:54:29 +00:00
Dmitriy Ivanov
2b0f2dbefb am cd13ae76: Merge "Switch to libsigchain.a" into lmp-mr1-dev 
* commit 'cd13ae76a54a2cd7f20730579486834c326fa272':
  Switch to libsigchain.a
 2014-12-10 22:31:40 +00:00
Dmitriy Ivanov
cd13ae76a5 Merge "Switch to libsigchain.a" into lmp-mr1-dev 2014-12-10 22:24:46 +00:00
Benjamin Franz
88daefb948 am 16d73a75: am a96ba381: Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev automerge: df55bf4 
* commit '16d73a752e9ee937c39be4ce2da5411cf1af0c5c':
  Only add successfully bound profile services to mProfileServices.
 2014-12-10 22:23:21 +00:00
Amith Yamasani
6f96a44df3 Stop guest user on exiting, to conserve resources 
Bug: 18672730
Change-Id: I17bc26ce2e10ceebeb18b75565daf21aa7df7774
 2014-12-10 14:21:48 -08:00
Joe Fernandez
6d0b2c53c6 resolved conflicts for merge of f9d2cd99 to master 
Change-Id: I8690866c6178ae0a18d45c138ffac8e6eb4be630
 2014-12-10 14:17:11 -08:00