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

130214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
28ad7b52e0 Fence on draws that are reported 
Change-Id: Ib2ec16cbda40f40df1710bdc868869ea8301f17e
 2014-04-07 16:59:25 -07:00
Alan Viverette
af22ce4701 Merge "Color theming for VectorDrawable, general clean up" 2014-04-07 23:55:29 +00:00
Alan Viverette
9453b7cfd4 Color theming for VectorDrawable, general clean up 
BUG: 13878079
Change-Id: I831d26fe3a2658161fc24e947bce382d0be6b548
 2014-04-07 16:50:46 -07:00
Narayan Kamath
c74221594d DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime. 
This value is overridden by the framework anyway
(see ActivityThread.handleBindApplication). Besides,
it doesn't seem like a great idea to let tools clutter
/sdcard/ with temp files.

(cherry picked from commit b3802a8e2360aaa0a88faa625e15c31b56eaf125)

Bug: 13763685
Bug: 13763900

Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1
 2014-04-07 16:45:05 -07:00
George Mount
a7c96693fd am f7fbe099: Merge "Allow opaque windows to become translucent." 
* commit 'f7fbe099a80a6955f7c910dbae3c6fecfc0b151a':
  Allow opaque windows to become translucent.
 2014-04-07 23:34:19 +00:00
George Mount
f7fbe099a8 Merge "Allow opaque windows to become translucent." 2014-04-07 23:28:44 +00:00
John Reck
389ea9111a am 96c637e9: Merge "Refcount RenderNode" 
* commit '96c637e9414600a67c71014274e7757161dcc709':
  Refcount RenderNode
 2014-04-07 22:49:26 +00:00
John Reck
96c637e941 Merge "Refcount RenderNode" 2014-04-07 22:42:21 +00:00
Leon Scroggins III
2e0103eb34 Remove SkFloatToScalar. 
Now that SkScalar is always float (it may someday be double, but
float to double is trivial), remove callers of SkFloatToScalar,
which is deprecated in Skia.

BUG:13694396

Change-Id: I524a9bb6f7702bc810bac55fb9d2cd5361a01cf7
 2014-04-07 18:41:17 -04:00
Craig Mautner
1cadf745d6 am 8ea553d0: am 8f2adcb1: am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity." 
* commit '8ea553d03a84e2fc3ded507dd978fca0dee22e77':
  [ActivityManager] Reduce report ANR on wrong activity.
 2014-04-07 22:32:26 +00:00
Deepanshu Gupta
538f44e7e7 am e9abc279: Merge "Fix theme/style resolution in Layoutlib" 
* commit 'e9abc279fd0e1cd3a7c0bfb878c9b5ae22840b9b':
  Fix theme/style resolution in Layoutlib
 2014-04-07 22:32:23 +00:00
Craig Mautner
8ea553d03a am 8f2adcb1: am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity." 
* commit '8f2adcb10e9ddf2cc06cc4af431c9afb7be9d79a':
  [ActivityManager] Reduce report ANR on wrong activity.
 2014-04-07 22:27:55 +00:00
Deepanshu Gupta
e9abc279fd Merge "Fix theme/style resolution in Layoutlib" 2014-04-07 22:27:01 +00:00
Craig Mautner
8f2adcb10e am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity." 
* commit '228cefa83dd7b95e5581f619bb597808af726f80':
  [ActivityManager] Reduce report ANR on wrong activity.
 2014-04-07 22:21:33 +00:00
Craig Mautner
228cefa83d am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity." 
* commit '3fb2b7132b64c65163e7c6cd948e45f703e93687':
  [ActivityManager] Reduce report ANR on wrong activity.
 2014-04-07 22:14:56 +00:00
Craig Mautner
3fb2b7132b Merge "[ActivityManager] Reduce report ANR on wrong activity." 2014-04-07 22:10:47 +00:00
John Reck
087bc0c14b Refcount RenderNode 
Change-Id: I7a86db8acc2b78ef33d987a43a119f5933d7d752
 2014-04-07 14:53:08 -07:00
Adam Hampson
4d693a5271 am 5951c83d: am ec571bd2: (-s ours) am ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev 
* commit '5951c83dfb38d7a3a01b5f2efc056929d20f647e':
  DO NOT MERGE Fix several bad function definitions.
 2014-04-07 21:46:53 +00:00
Adam Hampson
5951c83dfb am ec571bd2: (-s ours) am ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev 
* commit 'ec571bd203bb543aa1489e0c0a8bb67f5491630e':
  DO NOT MERGE Fix several bad function definitions.
 2014-04-07 21:40:00 +00:00
Adam Hampson
ec571bd203 am ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev 
* commit 'ce802f4898c5747038584596d9d689ca30c34c4e':
  DO NOT MERGE Fix several bad function definitions.
 2014-04-07 21:33:54 +00:00
Adam Hampson
ce802f4898 Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev 2014-04-07 21:27:53 +00:00
Robert Greenwalt
df12958a11 am 124af561: am 4455c599: (-s ours) am 0468e3c7: am e1d4847c: am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConf 
* commit '124af56165e7974748546ac2f243d4db8218f7b6':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 21:06:45 +00:00
Robert Greenwalt
124af56165 am 4455c599: (-s ours) am 0468e3c7: am e1d4847c: am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '4455c5999f72daaf6f15c4394e413976f14337d3':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:59:05 +00:00
Robert Greenwalt
9ea2c98245 am fa306850: am f00b906f: (-s ours) am cb163c68: am c855a28a: am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-de 
* commit 'fa30685038de6e812fe34b9b087f8c8a0785c737':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:57:55 +00:00
Robert Greenwalt
4455c5999f am 0468e3c7: am e1d4847c: am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '0468e3c7fae6945e21314ae2971c51dcb36972ee':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:52:59 +00:00
Robert Greenwalt
fa30685038 am f00b906f: (-s ours) am cb163c68: am c855a28a: am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit 'f00b906f01319a8177d2e2ab109ff01016b0bf4c':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:50:46 +00:00
Robert Greenwalt
0468e3c7fa am e1d4847c: am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit 'e1d4847c120f4ab72b3acfed17c0015bdb2befaf':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:46:58 +00:00
Robert Greenwalt
f00b906f01 am cb163c68: am c855a28a: am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit 'cb163c684d7a364684ef5b1a1937aa2e92856906':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:43:55 +00:00
Robert Greenwalt
e1d4847c12 am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '331fa429cad1f464f0375a3466ba528b03c6e90d':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:41:00 +00:00
Robert Greenwalt
cb163c684d am c855a28a: am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit 'c855a28a51ea10fcfb4dd20dcdbe26b6e08fe9d9':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:37:38 +00:00
Robert Greenwalt
331fa429ca am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit 'a3d3e8c4f92a637adc79ea21cc3c3ae49fe06312':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:34:49 +00:00
Robert Greenwalt
c855a28a51 am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '5f3c0630e488bbcee687933b6350370a42354dc4':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:31:45 +00:00
Alan Viverette
a489851ae8 am 365fdc5c: Merge "Revert action bar theme attribute" 
* commit '365fdc5c5bb761c450948345702beb3a1763ad9a':
  Revert action bar theme attribute
 2014-04-07 20:29:01 +00:00
Robert Greenwalt
a3d3e8c4f9 am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '463eeb70938403bdca2519d9b71911aab93b9277':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:27:50 +00:00
Robert Greenwalt
5f3c0630e4 am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '522bd7fb3468bc07133c7ff1a02033dcced740b9':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:26:35 +00:00
Alan Viverette
365fdc5c5b Merge "Revert action bar theme attribute" 2014-04-07 20:22:16 +00:00
Robert Greenwalt
463eeb7093 am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '2676e36ff6fc3f779cb6f1b0db13e26d734dcbab':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:21:52 +00:00
Alan Viverette
bbc6f3e631 Revert action bar theme attribute 
BUG: 13878093
Change-Id: I7cc4e270854f66d604a6e22eafbeef37c968fdae
 2014-04-07 13:21:38 -07:00
Robert Greenwalt
522bd7fb34 am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '24444abff4ad45b731d4f6cd92afed79568773d8':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:18:41 +00:00
Robert Greenwalt
2676e36ff6 am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '3e604b1198fcab0e3bf2fd29043e4172193db2b5':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:16:15 +00:00
Robert Greenwalt
24444abff4 am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '53691e39dca8be5dbe19bfef05b1c3e294d6c0bd':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:12:56 +00:00
Robert Greenwalt
3e604b1198 am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '2c90609c0bddb6fbe255e5632a1e6639e760290f':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:09:33 +00:00
Robert Greenwalt
53691e39dc am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '128e937108035b77537f279dc0bc85a116906819':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:07:10 +00:00
Robert Greenwalt
2c90609c0b am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '339cfdbde333984d02d189249f46e7b13317baed':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:03:55 +00:00
Robert Greenwalt
128e937108 am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '106627e07cecfa8a9bcc43578fde78652fc59eba':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:00:33 +00:00
Alan Viverette
09ee0c05d3 am 054ff085: Merge "Fix dialog width" 
* commit '054ff085f632a4796fe7bf024fc23d6c8a71011e':
  Fix dialog width
 2014-04-07 19:59:47 +00:00
Robert Greenwalt
339cfdbde3 am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '72f9b3084cf8bf0ca01ba52a853faeeb74acdad4':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:57:32 +00:00
Robert Greenwalt
106627e07c am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit 'e42ce676f54742f2d47c26adaa90407c2cb8cec8':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:54:13 +00:00
Alan Viverette
054ff085f6 Merge "Fix dialog width" 2014-04-07 19:52:17 +00:00
Robert Greenwalt
72f9b3084c am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs 
* commit '4bc58bd255f3a0cd9bb3a8f7a916a3cccb96ce6b':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:51:34 +00:00