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
Ye Wen
5d1a21e96a
am 2fc00600: am 3b5939fc: Merge "Add new error result code for mms config loading failure (1/2)" into lmp-dev
...
* commit '2fc0060027f917f7d798bf1e5412696df4bba708':
Add new error result code for mms config loading failure (1/2)
2014-09-18 20:56:59 +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
Nancy Chen
53c5a99c8e
am 8e15e306: am 93c75e45: Merge "Replace get*PhoneAccounts* public API methods with new method (1/3)" into lmp-dev
...
* commit '8e15e3060db3982adadc917dfccc4b144982dd6d':
Replace get*PhoneAccounts* public API methods with new method (1/3)
2014-09-18 20:56:28 +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
Ye Wen
9cacaffceb
am 3b5939fc: Merge "Add new error result code for mms config loading failure (1/2)" into lmp-dev
...
* commit '3b5939fc093043d4bfa4c1cfda80f4c5e9ab8548':
Add new error result code for mms config loading failure (1/2)
2014-09-18 20:00:49 +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
Ye Wen
9f5638ed23
Merge "Add new error result code for mms config loading failure (1/2)" into lmp-dev
2014-09-18 19:53:25 +00: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
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