Commit Graph

28234 Commits

Author SHA1 Message Date
Adam Powell
eaa74a42f9 am 9d40d872: Merge "Add support for shadows in TextAppearance styles"
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '9d40d8720d422fc39068e7b0b0ae6f13621c3de1':
  Add support for shadows in TextAppearance styles
2013-02-14 19:58:59 -08:00
Jeff Sharkey
0438d0ded5 am 07aef1c7: Merge "Remove throttle settings, no longer needed."
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '07aef1c78a92e70552f269b37615c19aea042410':
  Remove throttle settings, no longer needed.
2013-02-14 19:58:56 -08:00
Jeff Sharkey
452d589c65 am 7ee9f636: Merge "Expose longer statfs values, add derived values."
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '7ee9f636284584affa54b9735ccf157375b1c065':
  Expose longer statfs values, add derived values.
2013-02-14 19:58:53 -08:00
Mathias Agopian
0233b6ee33 am 30d7ab9a: fix docs build
# Via Mathias Agopian
* commit '30d7ab9a10fcde397bae7bed5f16d1094fded8b2':
  fix docs build
2013-02-14 19:58:47 -08:00
Kristian Monsen
1456758802 resolved conflicts for merge of 58a1ca66 to master-chromium
Change-Id: I06b61e6d7d52b584eae03a95220381475b8bff0e
2013-02-14 19:48:27 -08:00
Adam Powell
9d40d8720d Merge "Add support for shadows in TextAppearance styles" 2013-02-15 00:06:56 +00:00
Jeff Sharkey
07aef1c78a Merge "Remove throttle settings, no longer needed." 2013-02-15 00:02:17 +00:00
Jeff Sharkey
7ee9f63628 Merge "Expose longer statfs values, add derived values." 2013-02-14 23:46:01 +00:00
Mathias Agopian
30d7ab9a10 fix docs build
Change-Id: I9819693cfa9ad5b8b15b62eab60ddd35a53c5531
2013-02-14 15:39:04 -08: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
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
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
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
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
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
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
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
Mathias Agopian
f9136fd969 get rid of Surface.getIdentity()
Change-Id: I8b70d77cc1b38009ad71d92025c3beb481a18866
2013-02-13 17:01:42 -08:00
Kenny Root
0050dd105e am 0c868858: am fbed306f: am b0f4b8a7: Merge "Track keystore binder changes"
# Via Android Git Automerger (2) and others
* commit '0c86885888512b120e8691164799e06adb653b72':
  Track keystore binder changes
2013-02-13 16:04:06 -08:00
Kenny Root
0c86885888 am fbed306f: am b0f4b8a7: Merge "Track keystore binder changes"
# Via Android Git Automerger (1) and others
* commit 'fbed306fb9fe1a989a29c94d210e227ac07c2a03':
  Track keystore binder changes
2013-02-13 16:02:07 -08:00
Craig Mautner
b0c0b1fd70 Remove unused App methods.
Now that the Task methods have replaced the App methods remove
the App methods.

Change-Id: I0e7432f2c6f99708759ed8c871d20eb5bd38c3c2
2013-02-13 15:24:14 -08:00
Kenny Root
e151f281d5 Track keystore binder changes
Change-Id: Id6133be059a8a0901d16355a9152e40e4a255454
2013-02-13 15:22:25 -08:00
Chris Craik
c932760f66 Merge "Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE" 2013-02-13 23:14:58 +00:00
Philip Milne
fd0fa65eea Merge "Revert "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE""" 2013-02-13 22:23:45 +00:00
Philip Milne
57ce47134a Revert "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE""
Suspected cause of: http://b.corp.google.com/issue?id=8192858 

This reverts commit e5e0b7f191

Change-Id: I1a35c12c3ca0b1eacfb0c1a4d6ba03601dab664b
2013-02-13 22:07:50 +00:00
Romain Guy
93799ba01b Merge "Add a render buffer cache to reuse stencil buffers Bug #7146141" 2013-02-13 19:27:59 +00:00
Romain Guy
8d4aeb7111 Add a render buffer cache to reuse stencil buffers
Bug #7146141

This new cache is used in a similar way to LayerCache. It helps
reuse already allocated stencil buffers and thus avoid churning
memory on every frame.

Change-Id: I19551d72da52c40039e65904563600e492c8b193
2013-02-13 11:27:05 -08:00
Fabrice Di Meglio
0c33ecd209 Merge "Clean Paint.mBidiFlags as it is no longer used" 2013-02-13 19:11:50 +00:00
Chris Craik
7c1a49f5f5 Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE
This reverts commit 6c0307dd0a, reversing
changes made to a2cd828b74.

Conflicts:
	packages/SystemUI/res/values-sv/strings.xml

Change-Id: Ia178efe8b14751583d47b2826bfe3d3d5463dd2e
2013-02-13 10:50:20 -08:00
Chet Haase
f0bb8000a3 Merge "Fix getHitRect() to return correct rect for transformed child" 2013-02-13 15:29:36 +00:00
Philip Milne
d905005694 Merge "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE"" 2013-02-13 01:39:06 +00:00
Fabrice Di Meglio
615ba0f736 Merge "Fix bug #8185410 BidiFormatter code should not use the Dir enum anymore" 2013-02-13 01:28:55 +00:00
Fabrice Di Meglio
4d1937b731 Fix bug #8185410 BidiFormatter code should not use the Dir enum anymore
- replace Dir enum with static final int constants

Change-Id: Ibfd857e9767f14db92e50edb1681fef0d6598d99
2013-02-12 17:22:01 -08:00
Dianne Hackborn
b47e6c77b3 Merge "Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!" 2013-02-12 23:54:56 +00:00
Dianne Hackborn
56a2301c7a Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!
Change-Id: Ib05a2eb6a03db50074805a437a3639a7d10684a0
2013-02-12 15:41:49 -08:00
Fabrice Di Meglio
d04892d207 Merge "Add BidiFormatter utility" 2013-02-12 23:36:47 +00:00
Dianne Hackborn
244a1f7e59 Merge "App ops: media ops, set up to be callable from native code." 2013-02-12 23:27:48 +00:00
Svetoslav
90f73928d5 Merge "Adding public event callback instead of the internal one to UiAutomation." 2013-02-12 23:04:57 +00:00
Dianne Hackborn
d7d28e675e App ops: media ops, set up to be callable from native code.
This is to help implementation of bug #8181262 and maybe
bug #8181261

Adds some definition for media ops (though nothing is yet using
them), and re-arranges things a bit so we can implement native
calling in to the app ops service.

Also add some java docs.

Change-Id: I637959745db820e676f23a35a5d2224f51bc6689
2013-02-12 15:03:55 -08:00
Dianne Hackborn
a77ac32457 Merge "Fix issue #6595555: deal better with fragmentless headers." 2013-02-12 23:02:41 +00:00
Svetoslav
550b48fa18 Adding public event callback instead of the internal one to UiAutomation.
It appears that com.android.internal.util.Predicate is in the public
APIs but it is in the internal package. Leaking the predicate APIs is
a mistake and while we cannot fix that, this change is adding legit
public filter interface.

bug:8183223

Change-Id: I3e2c0ef685d7a832630aaa3ec2e8eae3fb058289
2013-02-12 15:01:09 -08:00