Svetoslav
688a994f4d
Merge "Print UI stuck when backing out of documents UI." into lmp-dev
2014-09-18 20:34:23 +00:00
Svetoslav
b75632c736
Print UI stuck when backing out of documents UI.
...
When user chooses to save to PDF we open the document chooser UI.
Now if the user now backs to the print UI without choosing a file,
the print UI has all options disabled and the back button does
not work - the user is stuck. This is because we were not
transitioning the print UI in the correct state.
bug:17557454
Change-Id: I385129e106ed41564b89137ca54d409127ba8ff0
2014-09-18 13:32:38 -07: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
John Reck
55aedc851e
am 1d58768d: am e182b60c: Merge "Revert "Make starting window hw-accelerated"" into lmp-dev
...
* commit '1d58768d4b421ab8a9c9aa0355941da158a22763':
Revert "Make starting window hw-accelerated"
2014-09-18 20:23:56 +00:00
Jeff Brown
e8e5ff317c
am 6cabbdae: am d510278d: Merge "Create an Application object for the system process." into lmp-dev
...
* commit '6cabbdaee2e79f107b2bbc5eeacdc1a6f8c29348':
Create an Application object for the system process.
2014-09-18 20:15:57 +00:00
Ye Wen
e479484f32
am 1eeea91c: am 3b5939fc: Merge "Add new error result code for mms config loading failure (1/2)" into lmp-dev
...
* commit '1eeea91c865ec251e0e65aa198373e003e9ac7fb':
Add new error result code for mms config loading failure (1/2)
2014-09-18 20:15:53 +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
Ye Wen
fc72b71b4b
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:28 +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
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
Dianne Hackborn
5bb2bda0e9
am 814391f3: am 9d301c82: Merge "Lock in final resource IDs." into lmp-dev
...
* commit '814391f3fb2f2cd8a331e99eba5fb46cf4b30177':
Lock in final resource IDs.
2014-09-18 19:52:01 +00: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
22c141d04f
am 9d301c82: Merge "Lock in final resource IDs." into lmp-dev
...
* commit '9d301c82182a1ae5ed7db431500d8e749dbee39d':
Lock in final resource IDs.
2014-09-18 19:40:16 +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
b76814f418
am 7142afa9: am 15af6c4e: Merge "Upper-case incoming AIDs." into lmp-dev
...
* commit '7142afa92a41a7aad2d0f4a91177532b425b6f0f':
Upper-case incoming AIDs.
2014-09-18 19:09:42 +00:00
Nancy Chen
02d07faa21
am 0274ed08: am 93c75e45: Merge "Replace get*PhoneAccounts* public API methods with new method (1/3)" into lmp-dev
...
* commit '0274ed08fd02412d8aaa555dfed6d297e1bef109':
Replace get*PhoneAccounts* public API methods with new method (1/3)
2014-09-18 19:09:38 +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
Nancy Chen
6810fb95a3
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
Winson Chung
27ac4e4806
am 2b8ef1ba: am f7093202: Enabling recents stack clipping
...
* commit '2b8ef1ba7d2f9277a1a45f0534356e5472cd9211':
Enabling recents stack clipping
2014-09-18 18:51:15 +00:00
Jorim Jaggi
21d23ea270
am f107e2b5: am 4615fa60: Merge "Add option for recents to use fake shadows" into lmp-dev
...
* commit 'f107e2b51b9d1db230edb49bdd5752ec86a5f445':
Add option for recents to use fake shadows
2014-09-18 18:51:12 +00:00
Selim Cinek
af9662ba43
am 1f90c017: am 25e58cf8: Merge "Removed round rect clipping and hardware layers from recents" into lmp-dev
...
* commit '1f90c017ce54f7d289638771f7025e2ddd8f76f9':
Removed round rect clipping and hardware layers from recents
2014-09-18 18:51:03 +00:00
Adrian Roos
4fbb72262e
am aac6a7d6: am 1c080f10: Merge "Reinitialize emergency calls only view if configuration changes" into lmp-dev
...
* commit 'aac6a7d666fde99ab18cd88258ba9958dfba5448':
Reinitialize emergency calls only view if configuration changes
2014-09-18 18:50:54 +00:00
Jason Monk
77afd703f4
am 70555210: am 5793422f: Merge "Add material camera_click sound" into lmp-dev
...
* commit '7055521077ea8a18a22451ec0bdb48b96a6c9339':
Add material camera_click sound
2014-09-18 18:50:50 +00:00
Jason Monk
ad61c96189
am 43d12acb: am b682d08a: Block QS in sec. users setup when simple
...
* commit '43d12acb14c5566b025b04e9812f02d39268d845':
Block QS in sec. users setup when simple
2014-09-18 18:50:46 +00:00
Esteban Talavera
d3c5cb8f38
am 9cc0285e: am a9744790: Merge "Make dpm command output more test friendly" into lmp-dev
...
* commit '9cc0285e37f7c0330847b693ebf3ca50f97dce23':
Make dpm command output more test friendly
2014-09-18 18:50:42 +00:00
Baligh Uddin
3ed2627569
am 033e2c3b: (-s ours) am 3bbb1ab1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '033e2c3bcf2940fc6def9d97775c262398198ed8':
Import translations. DO NOT MERGE
2014-09-18 18:50:39 +00:00
Baligh Uddin
4565d530ee
am 4f72de2d: (-s ours) am eb5c1513: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '4f72de2d96769abae0edcfbc80e307ca18bed7bb':
Import translations. DO NOT MERGE
2014-09-18 18:50:35 +00:00
Baligh Uddin
71ef5474e1
am 97652d92: (-s ours) am 8ef42c07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '97652d925ba690a501d0f56a33171015fa9e82f7':
Import translations. DO NOT MERGE
2014-09-18 18:50:31 +00:00
Craig Mautner
5b23e88f77
am 654ddc13: am 64d2ee09: Merge "Don\'t remove active stacks from window manager" into lmp-dev
...
* commit '654ddc130ddc1c09fd51d45570767fb028a03a73':
Don't remove active stacks from window manager
2014-09-18 18:50:28 +00:00
Alexandra Gherghina
2729013fdc
am 15a1ce26: am de1871b2: Merge "Add new icon for managed provisioning" into lmp-dev
...
* commit '15a1ce262e0f658f51745851d098b73802408291':
Add new icon for managed provisioning
2014-09-18 18:50:24 +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
e274b8f711
am f7093202: Enabling recents stack clipping
...
* commit 'f709320263f370145780270fdc825cfbc48912d1':
Enabling recents stack clipping
2014-09-18 18:44:44 +00:00
Jorim Jaggi
9a3fa7a5b5
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:44:39 +00:00
Selim Cinek
a15f1e2fc3
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:44:36 +00:00
Adrian Roos
51f43df10c
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:44:32 +00:00
Jason Monk
c91786ba94
am 5793422f: Merge "Add material camera_click sound" into lmp-dev
...
* commit '5793422f78573361cc0078e575ce36d8a41d934c':
Add material camera_click sound
2014-09-18 18:44:28 +00:00
Jason Monk
21956c773b
am b682d08a: Block QS in sec. users setup when simple
...
* commit 'b682d08a4162f3abf601040c700e877472f96193':
Block QS in sec. users setup when simple
2014-09-18 18:44:19 +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
Esteban Talavera
9b73513ba3
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:34:19 +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
Baligh Uddin
3f79b1639a
am 3bbb1ab1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '3bbb1ab13230ce13c93341dd58749f5bb37e7961':
Import translations. DO NOT MERGE
2014-09-18 18:34:10 +00:00
Baligh Uddin
d05f18e9f0
am eb5c1513: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'eb5c15132b5a4ac5b4de500fec836e9a5a493497':
Import translations. DO NOT MERGE
2014-09-18 18:34:06 +00:00