Alan Viverette
0a0072b2ab
am 67f0c2d8: am ec7467b0: Merge "Fix the underlined spinner asset to match text field" into lmp-dev
...
* commit '67f0c2d847baa6f0b20013d420d365b2c0caf254':
Fix the underlined spinner asset to match text field
2014-09-18 22:51:56 +00:00
Alan Viverette
152af6d630
am ec7467b0: Merge "Fix the underlined spinner asset to match text field" into lmp-dev
...
* commit 'ec7467b019dd2c78e270e87cc76248680677cc4f':
Fix the underlined spinner asset to match text field
2014-09-18 22:41:11 +00:00
Alan Viverette
28c5d8e862
Merge "Fix the underlined spinner asset to match text field" into lmp-dev
2014-09-18 22:26:03 +00:00
Craig Mautner
bf11570614
am d28e4019: am 43ce5500: Merge "Remove activity icon bitmaps from system process." into lmp-dev
...
* commit 'd28e40196d3bd5b697be4ed937978ce55f775772':
Remove activity icon bitmaps from system process.
2014-09-18 21:52:30 +00:00
Craig Mautner
fd9417d69e
am 43ce5500: Merge "Remove activity icon bitmaps from system process." into lmp-dev
...
* commit '43ce550039eb45dd0b6ff6d4abd7833cba2d06e0':
Remove activity icon bitmaps from system process.
2014-09-18 21:36:02 +00:00
Craig Mautner
bc3126f859
Merge "Remove activity icon bitmaps from system process." into lmp-dev
2014-09-18 21:25:24 +00:00
Alan Viverette
b0560839e8
am c216a2df: am 8766bdcb: Merge "Fix parsing of old-style intent URIs" into lmp-dev
...
* commit 'c216a2df8a92add1b04dbcf17ec8fb198409fe04':
Fix parsing of old-style intent URIs
2014-09-18 21:23:49 +00:00
Craig Mautner
648f69b95c
Remove activity icon bitmaps from system process.
...
When a TaskDescription is sent up to the system process, the Bitmap
contained in the mIcon member is immediately flushed to disk and the
name of the file replaces it in the TaskDescription. Thereby saving
mucho RAM for better uses.
Fixes bug 17527308.
Change-Id: Ifac63ea5d12ed091d1eb03e178b8b847a827f940
2014-09-18 14:16:26 -07:00
Alan Viverette
9b27ee1a47
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:06:05 +00:00
Alan Viverette
194206c4d7
am c5073a81: am fb15b0e2: Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev
...
* commit 'c5073a812a82928ae681c9fcd328a3b1323b4edc':
Use action bar theme for action modes, fix ViewStub inflation theme
2014-09-18 20:57:26 +00:00
Jon Miranda
c5e711eeb2
am 1ae494de: am bff124f1: Merge "Adds support for Theme dumping via DDM." into lmp-dev
...
* commit '1ae494deb79793c126e244c09ab9fd12a68df370':
Adds support for Theme dumping via DDM.
2014-09-18 20:57:19 +00:00
John Reck
7c48077877
am a0f5d726: am e182b60c: Merge "Revert "Make starting window hw-accelerated"" into lmp-dev
...
* commit 'a0f5d726fc8a5610e41c40e289fd107704202327':
Revert "Make starting window hw-accelerated"
2014-09-18 20:57:13 +00:00
Jeff Brown
116e069cdb
am 6fc160ed: am d510278d: Merge "Create an Application object for the system process." into lmp-dev
...
* commit '6fc160ed30b6d194bbf824c5674403fc622b94f1':
Create an Application object for the system process.
2014-09-18 20:57:04 +00:00
Dianne Hackborn
1e5223977e
am 85e4d515: am 9d301c82: Merge "Lock in final resource IDs." into lmp-dev
...
* commit '85e4d515a7610207cde07521c05d12297117d6cf':
Lock in final resource IDs.
2014-09-18 20:56:41 +00:00
Martijn Coenen
bc65b5cbdf
am 95bd8257: am 15af6c4e: Merge "Upper-case incoming AIDs." into lmp-dev
...
* commit '95bd8257caa7d0cff6dfb06bec6d72361d4f6625':
Upper-case incoming AIDs.
2014-09-18 20:56:34 +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
42f36235af
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:34 +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
3fe02fbba0
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:00 +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
c4005d2bfe
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:59 +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
9e835ea03a
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:54 +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
Alan Viverette
73aad6cefe
Fix the underlined spinner asset to match text field
...
Removes the spinner_textfield asset and replaces it with layered
spinner and textfield assets.
BUG: 17557459
Change-Id: I5dc98727c84ec22bc73328f2f94a380d920f1b7d
2014-09-18 12:45:53 -07:00
Dianne Hackborn
d176068a45
am 9d301c82: Merge "Lock in final resource IDs." into lmp-dev
...
* commit '9d301c82182a1ae5ed7db431500d8e749dbee39d':
Lock in final resource IDs.
2014-09-18 19:37:21 +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
Dianne Hackborn
b5dc5f6b55
Merge "Lock in final resource IDs." into lmp-dev
2014-09-18 19:24:59 +00:00
Martijn Coenen
493af8d6a8
am 15af6c4e: Merge "Upper-case incoming AIDs." into lmp-dev
...
* commit '15af6c4e0717b49b84ea32159fea7e4b7ceb48a6':
Upper-case incoming AIDs.
2014-09-18 19:00:09 +00:00
Martijn Coenen
da6ffa06b7
Merge "Upper-case incoming AIDs." into lmp-dev
2014-09-18 18:52:57 +00:00
Dianne Hackborn
a150a8bc71
Lock in final resource IDs.
...
Change-Id: I6da2c05737b7bc361a7c6f0862166f05de86c63f
2014-09-18 11:32:39 -07:00
Jon Miranda
e82a4eeb40
Adds support for Theme dumping via DDM.
...
Bug: 17515415
Change-Id: Ice145a4b452177e36345cf2e071377bb7b3feeb3
2014-09-18 11:29:08 -07:00
Baligh Uddin
bd8dfd52e2
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-18 18:10:39 +00:00
Alexandra Gherghina
833ba818b1
am bf9c9178: am de1871b2: Merge "Add new icon for managed provisioning" into lmp-dev
...
* commit 'bf9c91780827e490dda081990963f63bac409c8f':
Add new icon for managed provisioning
2014-09-18 17:30:17 +00:00
George Mount
4024de450c
am 40dc25a2: am b029590f: Merge "Default to using hardware layer during fade transition." into lmp-dev
...
* commit '40dc25a250f9f1ab7abcadae2d5e8700898a0e05':
Default to using hardware layer during fade transition.
2014-09-18 17:19:41 +00:00
Alexandra Gherghina
761fc014c5
am de1871b2: Merge "Add new icon for managed provisioning" into lmp-dev
...
* commit 'de1871b26d9cec542268a81c84f5380f6de86edf':
Add new icon for managed provisioning
2014-09-18 17:19:03 +00:00
George Mount
8d8bdc907b
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:07:21 +00:00
Alexandra Gherghina
1067b6e7ed
Merge "Add new icon for managed provisioning" into lmp-dev
2014-09-18 17:07:13 +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
Alexandra Gherghina
f8d9eb58f6
Add new icon for managed provisioning
...
This will be used for managed provisioning notifications and status
bar.
Bug: 17521583
Change-Id: Ic92d52a6a6366ca696ee85f42325f64ecce744b9
2014-09-18 16:16:14 +01:00
Alexandra Gherghina
5c8ce81c61
am a1625f74: am 70a21738: Merge "Fix broken svg icon" into lmp-dev
...
* commit 'a1625f740bf6f4dfbf534c9f69f6da5cda255e4e':
Fix broken svg icon
2014-09-18 13:28:23 +00:00
Alexandra Gherghina
465811af31
am 70a21738: Merge "Fix broken svg icon" into lmp-dev
...
* commit '70a217383c33bdc0f01a25660a6dd559d4af386a':
Fix broken svg icon
2014-09-18 13:17:39 +00:00
Alexandra Gherghina
a300fca9b8
Merge "Fix broken svg icon" into lmp-dev
2014-09-18 13:07:27 +00:00
Sander Alewijnse
549715d5fa
am a735243f: am 81b375a1: Merge "Update targetSdkVersion check." into lmp-dev
...
* commit 'a735243fba6ca4c0de7877831230d8c209882748':
Update targetSdkVersion check.
2014-09-18 12:00:22 +00:00
Alexandra Gherghina
e050122fd5
Fix broken svg icon
...
We need to do this because the old svg had the middle part broken.
Bug: 17544362
Change-Id: I72438a889b6c6a3c1dd50675afe73406f4b49ce9
2014-09-18 13:00:01 +01:00
Sander Alewijnse
82daf3b384
am 81b375a1: Merge "Update targetSdkVersion check." into lmp-dev
...
* commit '81b375a12f3b71b7d7ef7582216dc59303247894':
Update targetSdkVersion check.
2014-09-18 11:46:22 +00:00
Sander Alewijnse
d4710c87e6
Merge "Update targetSdkVersion check." into lmp-dev
2014-09-18 11:36:19 +00:00
Adam Powell
8b69e5685d
am 0c5b7311: am 1e2f3d98: Merge "Fix UserManager#isUserAGoat" into lmp-dev
...
* commit '0c5b731108dd1842f618e9cc58f07368b731d1dc':
Fix UserManager#isUserAGoat
2014-09-18 04:46:12 +00:00
Tsuwei Chen
d304396f8d
am 2426fd37: am 3de1584d: Merge "Allow carrier specific requirement on GPS features to be specified through a dedicated configuration key. Currently, carrier requirement is specified through CAPABILITIES key, whose original purpose is to indicate the capability of the
...
* commit '2426fd37faa699ae069a7a869c79904101b9dec8':
Allow carrier specific requirement on GPS features to be specified through a dedicated configuration key. Currently, carrier requirement is specified through CAPABILITIES key, whose original purpose is to indicate the capability of the hardware, not to enable/disable features in GPS HW. With this fix, carrier requirement on GPS features can be specified properly without messing up with the real capability. This will satisfy VzW, Sprint and USC's requirement on SUPL mode, without sacrificing the capability of HW geofence.
2014-09-18 04:45:54 +00:00