Commit Graph

41293 Commits

Author SHA1 Message Date
Alan Viverette
7e9cd14eff am 993fb7e9: am 9069fdda: am 8f1ee1d8: am 8766bdcb: Merge "Fix parsing of old-style intent URIs" into lmp-dev
* commit '993fb7e906148c7f07cabd33bd22f2a4d707f4ca':
  Fix parsing of old-style intent URIs
2014-09-18 21:52:12 +00:00
Alan Viverette
090537ee29 am 2f9ae13d: am f491d835: am 73d3c81c: am fb15b0e2: Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev
* commit '2f9ae13d5843d6f25cfaaf2db51b5a78e2a8ba33':
  Use action bar theme for action modes, fix ViewStub inflation theme
2014-09-18 21:23:38 +00:00
Alan Viverette
06e9f5345e am 8766bdcb: Merge "Fix parsing of old-style intent URIs" into lmp-dev
* commit '8766bdcb803698a2a2765bb46ab57bba655b41cf':
  Fix parsing of old-style intent URIs
2014-09-18 21:09:54 +00:00
Jon Miranda
f109b3ed28 am 9fdb986c: am a591604d: am dff9c8b3: am bff124f1: Merge "Adds support for Theme dumping via DDM." into lmp-dev
* commit '9fdb986cae241670f6a280e46ea821931fd45cd0':
  Adds support for Theme dumping via DDM.
2014-09-18 21:08:00 +00:00
John Reck
4958a0e9d4 am c669c6c7: am ef89494b: am 1d58768d: am e182b60c: Merge "Revert "Make starting window hw-accelerated"" into lmp-dev
* commit 'c669c6c77525ec5908e8eb7d223b120d2623f698':
  Revert "Make starting window hw-accelerated"
2014-09-18 21:00:37 +00:00
Jeff Brown
b115e5986b am bbeae741: am fb6989e4: am 6cabbdae: am d510278d: Merge "Create an Application object for the system process." into lmp-dev
* commit 'bbeae741c75fbe7fba2a91ab4b8c7a95f987494d':
  Create an Application object for the system process.
2014-09-18 21:00:33 +00:00
Martijn Coenen
eec243816a am 412d7a7c: am 6b3dc425: am 7142afa9: am 15af6c4e: Merge "Upper-case incoming AIDs." into lmp-dev
* commit '412d7a7cffc0f43390ed6768b964150dbd5c70ef':
  Upper-case incoming AIDs.
2014-09-18 20:56:17 +00:00
Alan Viverette
50572be361 Merge "Fix parsing of old-style intent URIs" into lmp-dev 2014-09-18 20:54:44 +00:00
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
Alan Viverette
0adf32bc1e Fix parsing of old-style intent URIs
Improves bounds checking to restrict category matches to within the
category(...) item. Fixes CTS failure in IntentTest.testGetIntentOld().

BUG: 17557490
Change-Id: I1859fe18eaa881b771bab373d705d8fbeb6406c4
2014-09-18 12:53:16 -07: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
247c002899 am 98e4606a: am 38c76c33: am 39da65b2: am b029590f: Merge "Default to using hardware layer during fade transition." into lmp-dev
* commit '98e4606a46954b05ab23cbf5d005a6c3543ed057':
  Default to using hardware layer during fade transition.
2014-09-18 17:42:19 +00: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
Adam Powell
76e8803f5e am a72bd678: am 400521f2: am aaceaabe: am 1e2f3d98: Merge "Fix UserManager#isUserAGoat" into lmp-dev
* commit 'a72bd6782f42f4766fb0dcc6755d2e9cca6940f4':
  Fix UserManager#isUserAGoat
2014-09-18 03:14:18 +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
5fd428f9af am f07d3ddb: am 840bb464: am da0f6ea9: am 50d23752: Merge "Use unified Tethering Permission Check" into lmp-dev
* commit 'f07d3ddbd4b9d8332101827c735d255c9359e475':
  Use unified Tethering Permission Check
2014-09-18 00:50:53 +00: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
Sandeep Siddhartha
b1a7ddfe54 am 2ee987c0: am fd719cfd: am aea51189: am e80c6f17: Merge "Fix issues with multiple languages and multi-users" into lmp-dev
* commit '2ee987c02239e6ebe1232505e3b9f9bd72d39a8a':
  Fix issues with multiple languages and multi-users
2014-09-17 20:51:01 +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
2c1f97e1a7 am d4a9f511: am eec860ae: am a7b20bba: am bfd9a30f: Merge "NetworkStats always needs arrays." into lmp-dev
* commit 'd4a9f511ba4e960836d951efeaa1a672d8869a32':
  NetworkStats always needs arrays.
2014-09-17 19:48:17 +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
Robert Greenwalt
dde45a4cf3 am e6068c9b: am 82c8eb07: am 061ac1be: am d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev
* commit 'e6068c9bf5675d02cc2aefff011c06542362fe74':
  Add NetworkAgent event for ExplicitlySelected
2014-09-17 14:14:49 +00:00
Adrian Roos
7a05448801 am 8eaf99a9: am 81171856: am bf665282: am 8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev
* commit '8eaf99a9a5a3062e928ee9c3025c12c31c57b7d8':
  Fix broken dispatch of onApplyWindowInsets
2014-09-17 14:14:26 +00:00
Brian Attwell
d0b62be2b7 am 827cb4a2: am 579aff33: am 9c943a94: am 56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev
* commit '827cb4a224028e8b05ec5e864ce94abd81e23e82':
  Pass different dy into dispatchNestedSCroll
2014-09-17 14:14:21 +00:00
Alan Viverette
fb632571f4 am a19e77b2: am a6b5de59: am b22bd84e: am 67798394: Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev
* commit 'a19e77b242c326129509b7fc442d5e54204c90f4':
  Preserve NPE behavior of removed TextView.getTextColors() API
2014-09-17 14:13:58 +00:00
Alan Viverette
e6ac6e1559 am e58f16ec: am ab1770df: am 86633337: am 07e867a0: Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev
* commit 'e58f16ecb903eb4ca280d427a77a4c3c49a6926f':
  Fix TimePicker.setCurrentHour() when argument is 0
2014-09-17 14:13:54 +00:00
Alan Viverette
14ce2dded0 am 084a8ea4: am b3a5b02a: am 27cf6cec: am 37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev
* commit '084a8ea4729c13f791015adb6c284bc3111f2796':
  Ensure we always have valid colors in CaptionStyle
2014-09-17 14:13:49 +00:00
Robert Greenwalt
1fd891b8b6 am 4b975101: am 46d6a418: am 3a68c1e8: am c8f6ad36: Merge "Report Network status to NetworkAgent." into lmp-dev
* commit '4b9751019ff25b61b84e2a8c6955f38d727efb73':
  Report Network status to NetworkAgent.
2014-09-17 14:13:31 +00:00
Craig Mautner
b4475e4d65 am fa26c157: am 0fb3fdab: am bfff2d63: am 880d88b3: Merge "Restore changes that were needed." into lmp-dev
* commit 'fa26c15724693e90c6c32486cb0f4ec6f3fcc0a6':
  Restore changes that were needed.
2014-09-17 14:13:27 +00:00
Craig Mautner
04f83f6577 am 05216ac8: am 675a6e4d: am 3d94fdac: am b53e4c4a: Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev
* commit '05216ac82ab73b3b0db3804516036d7902bbe380':
  Revert "Fix various bugs in DatePickerCalendarDelegate"
2014-09-17 14:13:10 +00:00