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
Adrian Roos
81e3e941fb
Disable QS user switcher when not supported
...
Bug: 17570310
Change-Id: Id32e076928c92c663645024f0d38b26ec4667b78
2014-09-18 21:11:20 +02: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
Winson Chung
91c616526c
am 4c31bfaf: am f7093202: Enabling recents stack clipping
...
* commit '4c31bfaff595d305393a06bb6cbe273196a23fbe':
Enabling recents stack clipping
2014-09-18 18:55:33 +00:00
Jorim Jaggi
921ed6beff
am 5dc58e27: am 4615fa60: Merge "Add option for recents to use fake shadows" into lmp-dev
...
* commit '5dc58e27194210c4af26436e755bd5ad3dc734d5':
Add option for recents to use fake shadows
2014-09-18 18:55:23 +00:00
Selim Cinek
e76545d855
am 913712b2: am 25e58cf8: Merge "Removed round rect clipping and hardware layers from recents" into lmp-dev
...
* commit '913712b25c92502aea51c7706fe56d323b66396d':
Removed round rect clipping and hardware layers from recents
2014-09-18 18:55:07 +00:00
Adrian Roos
327af4110b
am 0b667dac: am 1c080f10: Merge "Reinitialize emergency calls only view if configuration changes" into lmp-dev
...
* commit '0b667dac2205f66540557a3b4ac3ed9e35e537ff':
Reinitialize emergency calls only view if configuration changes
2014-09-18 18:55:02 +00:00
Jason Monk
6f5dd3a66b
am 0b4959ca: am 5793422f: Merge "Add material camera_click sound" into lmp-dev
...
* commit '0b4959caceea36178aef21b6df28225ce5229aee':
Add material camera_click sound
2014-09-18 18:54:57 +00:00
Jason Monk
d91a8283e3
am 1b147db9: am b682d08a: Block QS in sec. users setup when simple
...
* commit '1b147db9b4024ff37ae0fa8372fcc01f7861e2cc':
Block QS in sec. users setup when simple
2014-09-18 18:54:52 +00:00
Nancy Chen
99c602a4a3
am 93c75e45: Merge "Replace get*PhoneAccounts* public API methods with new method (1/3)" into lmp-dev
...
* commit '93c75e4567a727636d26e7e386a78a883e649e48':
Replace get*PhoneAccounts* public API methods with new method (1/3)
2014-09-18 18:54:37 +00:00
Martijn Coenen
da6ffa06b7
Merge "Upper-case incoming AIDs." into lmp-dev
2014-09-18 18:52:57 +00:00
Nancy Chen
7118220cff
Merge "Replace get*PhoneAccounts* public API methods with new method (1/3)" into lmp-dev
2014-09-18 18:46:43 +00:00
Winson Chung
06ba8adee5
am f7093202: Enabling recents stack clipping
...
* commit 'f709320263f370145780270fdc825cfbc48912d1':
Enabling recents stack clipping
2014-09-18 18:43:07 +00:00
Jorim Jaggi
2b82d17e6f
am 4615fa60: Merge "Add option for recents to use fake shadows" into lmp-dev
...
* commit '4615fa60c76a11d9492e01d7b8d434f857ebc52a':
Add option for recents to use fake shadows
2014-09-18 18:42:57 +00:00
Selim Cinek
e315e40268
am 25e58cf8: Merge "Removed round rect clipping and hardware layers from recents" into lmp-dev
...
* commit '25e58cf8faf937b679ab9359f9da7583b6cdf542':
Removed round rect clipping and hardware layers from recents
2014-09-18 18:42:52 +00:00
Adrian Roos
2054f514cc
am 1c080f10: Merge "Reinitialize emergency calls only view if configuration changes" into lmp-dev
...
* commit '1c080f10730802878b0d6718e5aefef3f256fcd0':
Reinitialize emergency calls only view if configuration changes
2014-09-18 18:42:46 +00:00
Ye Wen
d572e4504d
Add new error result code for mms config loading failure (1/2)
...
b/17556258
Change-Id: I589a7b77be215dc98fb9f2c9b1a04cac5ee53558
2014-09-18 11:42:45 -07:00
Jason Monk
3851960980
am 5793422f: Merge "Add material camera_click sound" into lmp-dev
...
* commit '5793422f78573361cc0078e575ce36d8a41d934c':
Add material camera_click sound
2014-09-18 18:42:41 +00:00
Jason Monk
681ccc001f
am b682d08a: Block QS in sec. users setup when simple
...
* commit 'b682d08a4162f3abf601040c700e877472f96193':
Block QS in sec. users setup when simple
2014-09-18 18:42:36 +00:00
Esteban Talavera
57eb34cc50
am a423bcc4: am a9744790: Merge "Make dpm command output more test friendly" into lmp-dev
...
* commit 'a423bcc4f348aa86761d76b4d55fd45bdc5d740e':
Make dpm command output more test friendly
2014-09-18 18:38:35 +00:00
Winson Chung
bf5dbf1c15
Enabling recents stack clipping
...
The taskviews now avoid overdraw by clipping invisible
parts. Also adapted some timings of the animation.
Bug: 17455301
Change-Id: Ifbf7bab363e530cb2ad842baed50fc16dcfcc4c4
2014-09-18 18:34:17 +00:00
Jorim Jaggi
a8433c6512
Merge "Add option for recents to use fake shadows" into lmp-dev
2014-09-18 18:33:42 +00:00
Selim Cinek
9aefd41557
Merge "Removed round rect clipping and hardware layers from recents" into lmp-dev
2014-09-18 18:33:26 +00:00
Dianne Hackborn
a150a8bc71
Lock in final resource IDs.
...
Change-Id: I6da2c05737b7bc361a7c6f0862166f05de86c63f
2014-09-18 11:32:39 -07:00
Adrian Roos
595f6d912a
Merge "Reinitialize emergency calls only view if configuration changes" into lmp-dev
2014-09-18 18:32:07 +00:00
Jason Monk
d127e58e41
Merge "Add material camera_click sound" into lmp-dev
2014-09-18 18:29:52 +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
Baligh Uddin
407a0ddf35
am f439a189: (-s ours) am 3bbb1ab1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'f439a189f741911a9231ad1dfe7f9b309a00a087':
Import translations. DO NOT MERGE
2014-09-18 18:26:43 +00:00
Jason Monk
3ad242df72
Block QS in sec. users setup when simple
...
When simple user switcher is enabled block QS for secondary users
during setup.
Bug: 16782635
Change-Id: Ibc39c61675f8728d73a5f8ef04d0613ff36af909
2014-09-18 18:26:39 +00:00
Baligh Uddin
d93cd23f9b
am 27cdfc81: (-s ours) am eb5c1513: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '27cdfc81b3eee4d2183b1f3141edb123ffea9c98':
Import translations. DO NOT MERGE
2014-09-18 18:26:38 +00:00
Baligh Uddin
e3c5b552af
am 642fda74: (-s ours) am 8ef42c07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '642fda74f4c3f6f6f689bc96efd871ca231ffba9':
Import translations. DO NOT MERGE
2014-09-18 18:26:33 +00:00
Esteban Talavera
73fc671533
am a9744790: Merge "Make dpm command output more test friendly" into lmp-dev
...
* commit 'a97447905d8f2480885112288bcee1c4c126d45e':
Make dpm command output more test friendly
2014-09-18 18:23:45 +00:00
George Mount
cc82424b44
Fix broken logic in isValidTarget
...
Bug 17553253
Change-Id: I9f3f2c80e59128fd5f8d4b1b2a67692c00804f62
2014-09-18 11:21:09 -07:00
Baligh Uddin
5ce02f1d07
am 3bbb1ab1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '3bbb1ab13230ce13c93341dd58749f5bb37e7961':
Import translations. DO NOT MERGE
2014-09-18 18:17:38 +00:00
Baligh Uddin
43b8ff97ef
am eb5c1513: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'eb5c15132b5a4ac5b4de500fec836e9a5a493497':
Import translations. DO NOT MERGE
2014-09-18 18:17:33 +00:00
Esteban Talavera
c5bf65aa96
Merge "Make dpm command output more test friendly" into lmp-dev
2014-09-18 18:15:49 +00:00
Baligh Uddin
29e2caf05f
am 8ef42c07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '8ef42c07e8ba05e3d97e078426210af64441f0c7':
Import translations. DO NOT MERGE
2014-09-18 18:12:51 +00:00
Baligh Uddin
bd8dfd52e2
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-18 18:10:39 +00:00
Baligh Uddin
61e7929a70
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-18 18:10:15 +00:00
Baligh Uddin
6641c1051f
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-18 18:00:17 +00:00
Craig Mautner
30200eefe6
am 10dc3725: am 64d2ee09: Merge "Don\'t remove active stacks from window manager" into lmp-dev
...
* commit '10dc372558fddc44d221ecc25272033a5de1f9ce':
Don't remove active stacks from window manager
2014-09-18 17:45:34 +00:00
Esteban Talavera
c48bca50fa
Make dpm command output more test friendly
...
Added 'Success' at the beginning of the command output every time
it didn't fail, so that we can easily check the output in tests.
The command is brand new, only used by us on CTS tests, so this
shouldn't break anybody.
Bug: 17312478
Change-Id: Ie67bf5b2f44e658e7009e5bd87f8cb81be515584
2014-09-18 18:32:45 +01: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
Craig Mautner
c01331602d
am 64d2ee09: Merge "Don\'t remove active stacks from window manager" into lmp-dev
...
* commit '64d2ee0982bfe4ef8186cb43236550a161d6f038':
Don't remove active stacks from window manager
2014-09-18 17:30:06 +00:00
Craig Mautner
103b143ecd
Merge "Don't remove active stacks from window manager" into lmp-dev
2014-09-18 17:20:51 +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