Craig Mautner
22ee9aad83
Merge "Reset and reuse Iterators and don't new() one."
2013-02-14 22:22:35 +00:00
Adam Powell
ac91df87fc
Add support for shadows in TextAppearance styles
...
Allow developers to specify shadow properties for text in a
TextAppearance, not just in direct TextView attributes.
Change-Id: I873fbaf2c26683895e1eea2d02b5d9b17ca333d0
2013-02-14 13:48:47 -08:00
Kenny Root
0786207be5
am dc7b3e3b: am 9657ba0e: Merge "KeyStore: stop using state()"
...
# Via Android Git Automerger (1) and others
* commit 'dc7b3e3b6e1aa3f347c7d843ee453688c4d90e29':
KeyStore: stop using state()
2013-02-14 12:50:34 -08:00
Craig Mautner
343ad71d7c
Reset and reuse Iterators and don't new() one.
...
Save time and memory by resuing permanent mTmpXxxIterator for
AllWindowsIterator and AppTokenIterator.
Change-Id: I2e5143364651d9471e9e70eee514d3f45d595468
2013-02-14 12:48:53 -08:00
Kenny Root
dc7b3e3b6e
am 9657ba0e: Merge "KeyStore: stop using state()"
...
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '9657ba0edc8bab5a36c26bcd94366149aed63331':
KeyStore: stop using state()
2013-02-14 12:48:18 -08:00
Mathias Agopian
58a1ca6642
Merge "split Surface in two classes: SurfaceControl and Surface"
2013-02-14 20:25:08 +00:00
Mathias Agopian
ab31d35749
am a41b23d5: Merge "get rid of Surface.getIdentity()"
...
# Via Android (Google) Code Review (1) and Mathias Agopian (1)
* commit 'a41b23d55da1bd8e68eb784f28e2c3fe9ded080e':
get rid of Surface.getIdentity()
2013-02-14 12:25:07 -08:00
Mathias Agopian
a41b23d55d
Merge "get rid of Surface.getIdentity()"
2013-02-14 20:22:33 +00:00
Mathias Agopian
3866f0d581
split Surface in two classes: SurfaceControl and Surface
...
SurfaceControl is the window manager side; it can
control the attributes of a surface but cannot push buffers
to it. Surface on the other hand is the application (producer)
side and is used to push buffers to the surface.
Change-Id: Ib6754c968924e87e8dd02a2073c7a447f729f4dd
2013-02-14 12:19:11 -08:00
Kenny Root
9657ba0edc
Merge "KeyStore: stop using state()"
2013-02-14 20:18:09 +00:00
Dirk Dougherty
c6583c3ed6
am dfb306b2: am f16de3f3: am 0f4a378d: am da9ac596: am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch.
...
# Via Android Git Automerger (5) and Dirk Dougherty (1)
* commit 'dfb306b2bc0adbec29e7ccd1a8ecb92502497573':
Doc change: add notice for iab v3 subscriptions launch.
2013-02-14 12:13:31 -08:00
Dirk Dougherty
dfb306b2bc
am f16de3f3: am 0f4a378d: am da9ac596: am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch.
...
# Via Android Git Automerger (4) and Dirk Dougherty (1)
* commit 'f16de3f3f622a04d48cd595c76165ac60a3efcfa':
Doc change: add notice for iab v3 subscriptions launch.
2013-02-14 12:11:30 -08:00
Dirk Dougherty
f16de3f3f6
am 0f4a378d: am da9ac596: am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch.
...
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '0f4a378dc7da59a4fe45c111c09f52696dbb6476':
Doc change: add notice for iab v3 subscriptions launch.
2013-02-14 12:09:16 -08:00
Dirk Dougherty
0f4a378dc7
am da9ac596: am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch.
...
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit 'da9ac596a171ff46a241f52a89015a0090e9ba18':
Doc change: add notice for iab v3 subscriptions launch.
2013-02-14 12:07:39 -08:00
Kenny Root
b9594ce9eb
KeyStore: stop using state()
...
Change-Id: I721974fd95f8d1ab06a3fd1bbb4c9b4d9d1d7752
2013-02-14 12:06:51 -08:00
Dirk Dougherty
da9ac596a1
am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch.
...
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '9a93e079791b7a94ca62a08963ff18951429700e':
Doc change: add notice for iab v3 subscriptions launch.
2013-02-14 12:05:49 -08:00
Dirk Dougherty
9a93e07979
am f857c51d: Doc change: add notice for iab v3 subscriptions launch.
...
# Via Dirk Dougherty
* commit 'f857c51d77d2199cfb3351e0e1c93a55e8564dc4':
Doc change: add notice for iab v3 subscriptions launch.
2013-02-14 12:03:35 -08:00
Dirk Dougherty
f857c51d77
Doc change: add notice for iab v3 subscriptions launch.
...
Change-Id: I3b1365cee219ab7fb8ac27cf333609986a947b3c
2013-02-14 11:47:36 -08:00
Craig Mautner
0db3416e37
am 3beb8757: Merge "Remove AppWindowToken lists."
...
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '3beb8757ac9ba0829bf96e067ae32315f1d4bb3f':
Remove AppWindowToken lists.
2013-02-14 11:43:49 -08:00
Craig Mautner
3beb8757ac
Merge "Remove AppWindowToken lists."
2013-02-14 19:40:23 +00:00
Russell Brenner
dfd2cfc085
am b3d71a10: Merge "Adjust captive portal test for setup wizard"
...
# Via Android (Google) Code Review (1) and Russell Brenner (1)
* commit 'b3d71a106e9f142ffe3ee901c63dac91640a74b9':
Adjust captive portal test for setup wizard
2013-02-14 11:36:46 -08:00
Russell Brenner
b3d71a106e
Merge "Adjust captive portal test for setup wizard"
2013-02-14 19:31:46 +00:00
Russell Brenner
108da0cfa4
Adjust captive portal test for setup wizard
...
During setup wizard, perform captive portal test without the typical
delays.
Change-Id: If596948e732966817aae6201440e87e19be0c2f8
2013-02-14 11:02:10 -08:00
Craig Mautner
496bdbba30
Remove AppWindowToken lists.
...
No longer necessary.
Change-Id: I0d2b96f69152fb93b6ba56f02ce9693ff1370cbc
2013-02-14 10:56:11 -08:00
Romain Guy
feb6954da1
am 10c0aa24: Merge "Implement support for drawBitmapMesh\'s colors array"
...
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '10c0aa246d9b2633c6cb4e5b714abb0031a4f4cd':
Implement support for drawBitmapMesh's colors array
2013-02-14 10:54:21 -08:00
Romain Guy
10c0aa246d
Merge "Implement support for drawBitmapMesh's colors array"
2013-02-14 18:51:28 +00:00
Craig Mautner
187cd3e161
am 45dc56f3: Merge "Fix build."
...
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '45dc56f3cc6cf890d2f8a28021f46ad1e9028f5e':
Fix build.
2013-02-14 10:39:35 -08:00
Craig Mautner
45dc56f3cc
Merge "Fix build."
2013-02-14 18:36:10 +00:00
Craig Mautner
ee006a14b2
Fix build.
...
Change-Id: I6fb00530536e5203d89805141792289ed7c1d8e3
2013-02-14 10:35:32 -08:00
Craig Mautner
102f711043
am 534d136a: Merge "Remove unused App methods."
...
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '534d136aa66fb13f7c1b482513627de45c218c29':
Remove unused App methods.
2013-02-14 10:16:57 -08:00
Craig Mautner
534d136aa6
Merge "Remove unused App methods."
2013-02-14 18:13:26 +00:00
Jeff Sharkey
ead9389fd2
Remove throttle settings, no longer needed.
...
Since the throttle feature has been removed, its configuration
settings are no longer needed.
Change-Id: Iaf3cb74a372d43d580f42566d21843a2eb653d3e
2013-02-14 09:52:42 -08:00
Robert Greenwalt
9678c61fec
am fd869887: Merge "Fix a permissions probem in ConnectivityManager"
...
# Via Android (Google) Code Review (1) and Robert Greenwalt (1)
* commit 'fd869887c3477bb2699b72ea752a8466602ea637':
Fix a permissions probem in ConnectivityManager
2013-02-14 08:46:28 -08:00
Robert Greenwalt
fd869887c3
Merge "Fix a permissions probem in ConnectivityManager"
2013-02-14 16:43:33 +00:00
Craig Mautner
ac30688b0a
am f0b36c55: Merge "Refactor setAppOpVisibility implementation."
...
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit 'f0b36c559074718c5e932c20a9931d97d9c061ef':
Refactor setAppOpVisibility implementation.
2013-02-13 22:23:40 -08:00
Craig Mautner
f0b36c5590
Merge "Refactor setAppOpVisibility implementation."
2013-02-14 06:22:32 +00:00
Jason Sams
58300de305
am 30d2f8d6: Merge "Convert live preview demo to IO_OUTPUT"
...
# Via Android (Google) Code Review (1) and Jason Sams (1)
* commit '30d2f8d6e0c26dd32dc8b737170253f015156591':
Convert live preview demo to IO_OUTPUT
2013-02-13 18:48:21 -08:00
Jason Sams
30d2f8d6e0
Merge "Convert live preview demo to IO_OUTPUT"
2013-02-14 02:45:40 +00:00
Jeff Sharkey
b65ce57675
Expose longer statfs values, add derived values.
...
Since fsblkcnt_t is 8 bytes, provide methods to access larger value
instead of casting to int. This would start being an issue around
8TB filesystems.
Also add convenience methods to calculate values in bytes.
Change-Id: Ib924425d8d6d82785466f611ca71800cc1e952b6
2013-02-13 18:40:35 -08:00
Romain Guy
ff316ec7a7
Implement support for drawBitmapMesh's colors array
...
Change-Id: I3d901f6267c2918771ac30ff55c8d80c3ab5b725
2013-02-13 18:39:43 -08:00
Jeff Sharkey
221badd071
am 7e72a693: Merge "Remove sscanf() warnings when parsing stats."
...
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '7e72a693cfe2facc701d7202d91c211d212ce20e':
Remove sscanf() warnings when parsing stats.
2013-02-13 18:18:07 -08:00
Jeff Sharkey
1f6692f1f9
am aec6bcfb: Merge "Parse network stats using native code."
...
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit 'aec6bcfb767a4b9dfd391bff338a8ff284b29549':
Parse network stats using native code.
2013-02-13 18:14:31 -08:00
Jeff Sharkey
7e72a693cf
Merge "Remove sscanf() warnings when parsing stats."
2013-02-14 02:14:17 +00:00
Jeff Sharkey
9de56d220e
Remove sscanf() warnings when parsing stats.
...
Change-Id: I15b7ba93d7ec121f9a7e19926f7436f2117b3b1a
2013-02-13 18:13:01 -08:00
Jeff Sharkey
aec6bcfb76
Merge "Parse network stats using native code."
2013-02-14 02:12:31 +00:00
Daniel Sandler
7eb092a39c
am 2977a30e: Merge "More debug logs for stuck statusbars."
...
# Via Android (Google) Code Review (1) and Daniel Sandler (1)
* commit '2977a30ef422f2be4a5ef74dd1a5a32a6a8f994b':
More debug logs for stuck statusbars.
2013-02-13 17:55:15 -08:00
Daniel Sandler
2977a30ef4
Merge "More debug logs for stuck statusbars."
2013-02-14 01:49:59 +00:00
Daniel Sandler
37a38aaecb
More debug logs for stuck statusbars.
...
Bug: 7686690
Change-Id: Ic58d90a56412579cad0c77f5787a6fc4193a32d1
2013-02-13 20:47:48 -05:00
Jeff Sharkey
9a2c2a6da9
Parse network stats using native code.
...
Switch to parsing detailed network stats with native code, which
is 71% faster than ProcFileReader.
Change-Id: I2525aaee74d227ce187ba3a74dd08a2b06514deb
2013-02-13 17:40:49 -08:00
Fabrice Di Meglio
c504c4e51d
am 336fcac3: Merge "Fix bug #8194572 Chrome SIGBUS\'es on launch around TextLayoutCacheKey"
...
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit '336fcac31ddccc7e7a6773d03e7cb17967ebb898':
Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey
2013-02-13 17:38:31 -08:00