Alan Viverette
e88d918fbe
am fb15b0e2: Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev
...
* commit 'fb15b0e2566d80dbedc8f91bdc0a1edb88ce1ec2':
Use action bar theme for action modes, fix ViewStub inflation theme
2014-09-18 20:35:39 +00:00
Alan Viverette
07ecc748fb
Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev
2014-09-18 20:25:22 +00:00
Jon Miranda
583a766054
am bff124f1: Merge "Adds support for Theme dumping via DDM." into lmp-dev
...
* commit 'bff124f1e86a6cfc1710d41bedd060b7378de06b':
Adds support for Theme dumping via DDM.
2014-09-18 20:24:34 +00:00
Jon Miranda
3c7f018f42
Merge "Adds support for Theme dumping via DDM." into lmp-dev
2014-09-18 20:14:05 +00:00
John Reck
edfef021a7
am e182b60c: Merge "Revert "Make starting window hw-accelerated"" into lmp-dev
...
* commit 'e182b60cb71437d1f2adf258a248b2e6b0f59821':
Revert "Make starting window hw-accelerated"
2014-09-18 20:11:51 +00:00
John Reck
7e3d6c988c
Merge "Revert "Make starting window hw-accelerated"" into lmp-dev
2014-09-18 20:01:15 +00:00
Jeff Brown
5dcad55b96
am d510278d: Merge "Create an Application object for the system process." into lmp-dev
...
* commit 'd510278d491ed9669c198ee79377a0ff1ab2fc48':
Create an Application object for the system process.
2014-09-18 20:00:32 +00:00
Jeff Brown
2b5f91fe98
Merge "Create an Application object for the system process." into lmp-dev
2014-09-18 19:53:37 +00:00
John Reck
61375a8bb5
Revert "Make starting window hw-accelerated"
...
Bug: 17516789
This change corresponds to a sudden influx of bad surface crashes.
Reverting to see if stability returns as this was an optimization
CL
This reverts commit 29ff1bc57ac2c995c56f15ed6e56e5fb247b2a44.
Change-Id: I7835e89017161d94ad05fe46d81bd437c3dae3a7
2014-09-18 19:29:23 +00:00
Martijn Coenen
9cba2fff2f
am 15af6c4e: Merge "Upper-case incoming AIDs." into lmp-dev
...
* commit '15af6c4e0717b49b84ea32159fea7e4b7ceb48a6':
Upper-case incoming AIDs.
2014-09-18 19:00:20 +00:00
Martijn Coenen
da6ffa06b7
Merge "Upper-case incoming AIDs." into lmp-dev
2014-09-18 18:52:57 +00:00
Jon Miranda
e82a4eeb40
Adds support for Theme dumping via DDM.
...
Bug: 17515415
Change-Id: Ice145a4b452177e36345cf2e071377bb7b3feeb3
2014-09-18 11:29:08 -07:00
George Mount
510ca08d9e
am b029590f: Merge "Default to using hardware layer during fade transition." into lmp-dev
...
* commit 'b029590fdbba56b5e09dc2e48b4045aefadcf26f':
Default to using hardware layer during fade transition.
2014-09-18 17:09:12 +00:00
George Mount
48af9ddbb6
Merge "Default to using hardware layer during fade transition." into lmp-dev
2014-09-18 16:56:46 +00:00
Sander Alewijnse
a65914f4d7
am 81b375a1: Merge "Update targetSdkVersion check." into lmp-dev
...
* commit '81b375a12f3b71b7d7ef7582216dc59303247894':
Update targetSdkVersion check.
2014-09-18 11:45:53 +00:00
Sander Alewijnse
d4710c87e6
Merge "Update targetSdkVersion check." into lmp-dev
2014-09-18 11:36:19 +00:00
Adam Powell
6769191bee
am 1e2f3d98: Merge "Fix UserManager#isUserAGoat" into lmp-dev
...
* commit '1e2f3d98e74c1b0d81fa536a70241bb998d29036':
Fix UserManager#isUserAGoat
2014-09-18 01:43:03 +00:00
Alan Viverette
a9ddb8dc23
Use action bar theme for action modes, fix ViewStub inflation theme
...
BUG: 17262483
BUG: 17513621
Change-Id: I74764570a11da162a224e94978e21e52d17e2e84
2014-09-17 18:14:32 -07:00
Adam Powell
988ae30ff7
Fix UserManager#isUserAGoat
...
Correctly detect if the user is a goat.
Change-Id: I78577dd7ec8c3685434ee03560010a6ea4db127f
2014-09-17 18:12:13 -07:00
Robert Greenwalt
a35bd707e0
am 50d23752: Merge "Use unified Tethering Permission Check" into lmp-dev
...
* commit '50d2375281ac0743daf55680611b3387cc55fb2c':
Use unified Tethering Permission Check
2014-09-18 00:11:55 +00:00
Robert Greenwalt
f3b47e95b1
Merge "Use unified Tethering Permission Check" into lmp-dev
2014-09-18 00:02:16 +00:00
Robert Greenwalt
edb47668f0
Use unified Tethering Permission Check
...
The BT and Wifi mechanisms for enabling Tethering did their own
permission checks. This set of changes unifies the check into
a ConnectivityManager function so they can be kept in sync.
bug:17435527
Change-Id: I8c157a5acf56ffbddd349cb6a45160ae7be8541b
2014-09-17 16:18:12 -07:00
George Mount
dc5bf6a7f0
Default to using hardware layer during fade transition.
...
Bug 17499864
When hasOverlappingRendering() is true, a layer is used to
to fade views because performance can be much worse then.
When hasOverlappingRendering() is false, the performance
is not hurt and a layer is not used.
Change-Id: If3fb1c23ffc8d0bef85c9d16df6c26ff4bbd49ac
2014-09-17 15:41:18 -07:00
Jeff Brown
7fc8e357a4
Create an Application object for the system process.
...
Change-Id: Icd959fd859a7a556fbcbc519ff8646e1bf95fedc
2014-09-17 14:19:31 -07:00
Yigit Boyar
27abd85f5c
am 7fa36f26: Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev
...
* commit '7fa36f26c6705346e41f81f6d3f2f8a22dd3b42c':
Handle action mode changes properly for actionbar tabs
2014-09-17 21:08:23 +00:00
Yigit Boyar
fd20f196b1
Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev
2014-09-17 21:00:40 +00:00
Sandeep Siddhartha
329489abdd
am e80c6f17: Merge "Fix issues with multiple languages and multi-users" into lmp-dev
...
* commit 'e80c6f17079155855aa11eae47b619af0ebb591c':
Fix issues with multiple languages and multi-users
2014-09-17 20:21:05 +00:00
Sandeep Siddhartha
80ea66b102
Merge "Fix issues with multiple languages and multi-users" into lmp-dev
2014-09-17 20:06:43 +00:00
Jeff Sharkey
9213ab323b
am bfd9a30f: Merge "NetworkStats always needs arrays." into lmp-dev
...
* commit 'bfd9a30f528dff00ae925a0e1f0ec18f669b3f1b':
NetworkStats always needs arrays.
2014-09-17 19:12:05 +00:00
Jeff Sharkey
9d375ecbe6
Merge "NetworkStats always needs arrays." into lmp-dev
2014-09-17 19:01:13 +00:00
Jeff Sharkey
7a8f1a32dc
NetworkStats always needs arrays.
...
Internal logic relies on Arrays.copyOf(), so always give ourselves
valid arrays, using shared empty objects to save overhead.
Bug: 17502649
Change-Id: I5dbb00545bdfe45bbd48144ab505ea08cc92cbcd
2014-09-17 09:26:31 -07:00
Yigit Boyar
2bbad0cddc
Handle action mode changes properly for actionbar tabs
...
Bug: 17513613
Change-Id: I4ebcadc618558153b72bf577232adc3e616adb6b
2014-09-16 18:28:03 -07:00
Robert Greenwalt
9e1d9f0fb2
am d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev
...
* commit 'd0675e37718d3223623e4fbf0f5e8e0e46c10d5f':
Add NetworkAgent event for ExplicitlySelected
2014-09-17 00:13:54 +00:00
Robert Greenwalt
e7b26be378
Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev
2014-09-17 00:06:03 +00:00
Robert Greenwalt
e73cc4646b
Add NetworkAgent event for ExplicitlySelected
...
Lets Wifi tell us when the user selected this AP vs auto-connected.
bug:17396168
Change-Id: I6e067ab62ed49040629aa31fe07ff880d3d542f0
2014-09-16 17:03:59 -07:00
Adrian Roos
d804482660
am 8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev
...
* commit '8f4cafc281eb2c40b409f86ad276b4337f5fd317':
Fix broken dispatch of onApplyWindowInsets
2014-09-16 23:58:07 +00:00
Brian Attwell
598c4f9329
am 56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev
...
* commit '56d143ae20eb731d2826fe6efdf330f3c7c14071':
Pass different dy into dispatchNestedSCroll
2014-09-16 23:45:03 +00:00
Adrian Roos
543f21da46
Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev
2014-09-16 23:42:40 +00:00
Brian Attwell
5665c0f265
Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev
2014-09-16 23:33:24 +00:00
Alan Viverette
56debf9a14
am 67798394: Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev
...
* commit '67798394819f1b8af9afb8f35fda0d0f0552f027':
Preserve NPE behavior of removed TextView.getTextColors() API
2014-09-16 23:30:54 +00:00
Alan Viverette
e748ca5dc9
am 07e867a0: Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev
...
* commit '07e867a059a6bef19fb92663d02a03a90cd356e8':
Fix TimePicker.setCurrentHour() when argument is 0
2014-09-16 23:30:50 +00:00
Alan Viverette
6acb495af2
am 37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev
...
* commit '37cbd74ad6dc3c7639e2ce8200ca40a2acc275ef':
Ensure we always have valid colors in CaptionStyle
2014-09-16 23:30:46 +00:00
Alan Viverette
af8e823d99
Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev
2014-09-16 23:25:07 +00:00
Alan Viverette
4813482324
Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev
2014-09-16 23:23:23 +00:00
Alan Viverette
96f26b8039
Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev
2014-09-16 23:20:28 +00:00
Martijn Coenen
5e991a129c
Upper-case incoming AIDs.
...
This fixes scenarios where different services
register the same AID in a different case, and
we don't see any conflict.
Bug: 16517161
Change-Id: I610b585ce7d57b4e32c21004a1d4c50e1133986a
2014-09-16 16:06:45 -07:00
Robert Greenwalt
9d1723558b
am c8f6ad36: Merge "Report Network status to NetworkAgent." into lmp-dev
...
* commit 'c8f6ad366accbe6bf90d30d4e2d4f924552d731a':
Report Network status to NetworkAgent.
2014-09-16 23:05:35 +00:00
Craig Mautner
ea0dbf3fa2
am 880d88b3: Merge "Restore changes that were needed." into lmp-dev
...
* commit '880d88b308c73a598578f39892a3f01c201d9314':
Restore changes that were needed.
2014-09-16 23:00:11 +00:00
Robert Greenwalt
b4f601cb84
Merge "Report Network status to NetworkAgent." into lmp-dev
2014-09-16 22:59:33 +00:00
Alan Viverette
f1820064d9
Ensure we always have valid colors in CaptionStyle
...
BUG: 17521623
Change-Id: I861aa189970fc14dd3e4426e5487a14f373d3a2e
2014-09-16 15:53:33 -07:00