Winson Chung
7bf2fc5bba
am 06ec3d55: am 5c744b1b: Merge "Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)" into lmp-dev
...
* commit '06ec3d5554a099a552dcc563e9d9302d48794179':
Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)
2014-09-19 00:15:28 +00:00
Winson Chung
aab1a058db
am 5c744b1b: Merge "Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)" into lmp-dev
...
* commit '5c744b1b01156c37f894619fbe70741435d7ed53':
Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)
2014-09-19 00:03:54 +00:00
Winson Chung
f7dd908171
Merge "Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)" into lmp-dev
2014-09-18 23:50:32 +00:00
Craig Mautner
dd6ba7d3be
am 888e1a2e: am 992ea042: Merge "Don\'t count finishing activities as effective activities." into lmp-dev
...
* commit '888e1a2ec6208e923254fc223800af06aa051a20':
Don't count finishing activities as effective activities.
2014-09-18 23:28:57 +00:00
Craig Mautner
879c239d8a
am 992ea042: Merge "Don\'t count finishing activities as effective activities." into lmp-dev
...
* commit '992ea04287486759d1cc17a4f18ff96c15bc47c2':
Don't count finishing activities as effective activities.
2014-09-18 23:16:19 +00:00
George Mount
5749cc099c
am 48da8468: am 085cb2d2: Merge "Fix broken logic in isValidTarget" into lmp-dev
...
* commit '48da84681735bde486d3604341eb2aef9e2c7c83':
Fix broken logic in isValidTarget
2014-09-18 23:10:55 +00:00
Winson Chung
6b6ed9175b
am 65dea471: am 537dde12: Merge "Listening for widget changes while Recents is in the background. (Bug 17153663)" into lmp-dev
...
* commit '65dea471b7dafeea9241aff47c39324ab844f741':
Listening for widget changes while Recents is in the background. (Bug 17153663)
2014-09-18 23:10:51 +00:00
Craig Mautner
6920feedb5
Merge "Don't count finishing activities as effective activities." into lmp-dev
2014-09-18 23:08:25 +00:00
George Mount
d137a27e16
am 085cb2d2: Merge "Fix broken logic in isValidTarget" into lmp-dev
...
* commit '085cb2d2f23ee497ddfb94b970da27d782b49dc0':
Fix broken logic in isValidTarget
2014-09-18 23:01:45 +00:00
Winson Chung
410040915f
am 537dde12: Merge "Listening for widget changes while Recents is in the background. (Bug 17153663)" into lmp-dev
...
* commit '537dde12838358aed704ae1afe0d66e4cb8cb045':
Listening for widget changes while Recents is in the background. (Bug 17153663)
2014-09-18 23:01:41 +00:00
Igor Murashkin
2d23de2cae
Merge "camera: Fix missing optional Face fields (eyes, mouth, id)" into lmp-mr1-dev
2014-09-18 22:54:39 +00:00
George Mount
7343ba2f80
Merge "Fix broken logic in isValidTarget" into lmp-dev
2014-09-18 22:51:23 +00:00
Alan Viverette
d0373a756a
am d78bc33f: am ec7467b0: Merge "Fix the underlined spinner asset to match text field" into lmp-dev
...
* commit 'd78bc33ff1962285601738f957cbad7c055ee60a':
Fix the underlined spinner asset to match text field
2014-09-18 22:50:11 +00:00
Winson Chung
3133616d92
Merge "Listening for widget changes while Recents is in the background. (Bug 17153663)" into lmp-dev
2014-09-18 22:45:26 +00:00
Igor Murashkin
0601ab1618
camera: Fix missing optional Face fields (eyes, mouth, id)
...
Bug: 17557634
Change-Id: Ife2ba0cb881f9dba3195b02021fb1876a6d0825e
2014-09-18 22:42:10 +00:00
Alan Viverette
fde151ef96
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:12 +00:00
Craig Mautner
4767f4b3a9
Don't count finishing activities as effective activities.
...
They were being counted as effectiveRoot even though they were
finishing.
Fixes bug 17550936.
Change-Id: Iaf7201e6150095e55f88344e4b257e4ae8f19a2b
2014-09-18 22:40:12 +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
Adrian Roos
1bc255cd56
am a7878cc0: am 5e5c78a6: Merge "Additional check to determine insets for recents animation" into lmp-dev
...
* commit 'a7878cc0b5914f314027fc8f189aacc5ef6ee3f4':
Additional check to determine insets for recents animation
2014-09-18 21:52:34 +00:00
Adrian Roos
2ae32f0852
am 664bd7b8: am 30defcc4: Merge "Disable QS user switcher when not supported" into lmp-dev
...
* commit '664bd7b8266b268dc345cce212a51fc735122fe9':
Disable QS user switcher when not supported
2014-09-18 21:52:31 +00:00
Craig Mautner
e607245485
am d5dad300: am 43ce5500: Merge "Remove activity icon bitmaps from system process." into lmp-dev
...
* commit 'd5dad300424d5cab159eb8a50592291784b3cfad':
Remove activity icon bitmaps from system process.
2014-09-18 21:52:25 +00:00
Adrian Roos
064bcf7cbf
am 5e5c78a6: Merge "Additional check to determine insets for recents animation" into lmp-dev
...
* commit '5e5c78a6a6edeab3bb06a7dafec479c1d92f040e':
Additional check to determine insets for recents animation
2014-09-18 21:37:04 +00:00
Adrian Roos
869377d2b5
am 30defcc4: Merge "Disable QS user switcher when not supported" into lmp-dev
...
* commit '30defcc4e1cfdb9792840577cfc7fa3708d2a521':
Disable QS user switcher when not supported
2014-09-18 21:37:00 +00:00
Craig Mautner
1ef73b3903
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:55 +00:00
wsmlby
79f8960ffe
am 4746e825: am fa3fb593: Merge "Add leanback support to AppCompatiblityTest" into lmp-dev
...
* commit '4746e825620af37e26128fb1375b85af5e68426a':
Add leanback support to AppCompatiblityTest
2014-09-18 21:32:28 +00:00
Adrian Roos
8f2152c021
Merge "Additional check to determine insets for recents animation" into lmp-dev
2014-09-18 21:30:00 +00:00
Adrian Roos
59b17d83eb
Merge "Disable QS user switcher when not supported" into lmp-dev
2014-09-18 21:28:11 +00:00
Craig Mautner
bc3126f859
Merge "Remove activity icon bitmaps from system process." into lmp-dev
2014-09-18 21:25:24 +00:00
Christopher Tate
c79f21c655
am bd81fd28: am 6330e891: Merge "Log alarm delivery only when localLOGV" into lmp-dev
...
* commit 'bd81fd28d4fa505da683417197ac89c8a3b0aca0':
Log alarm delivery only when localLOGV
2014-09-18 21:20:13 +00:00
Alan Viverette
d060780b60
am 8f1ee1d8: am 8766bdcb: Merge "Fix parsing of old-style intent URIs" into lmp-dev
...
* commit '8f1ee1d832a3a76ce505dc833a519084522ec036':
Fix parsing of old-style intent URIs
2014-09-18 21:20:09 +00:00
wsmlby
09043f69c5
am fa3fb593: Merge "Add leanback support to AppCompatiblityTest" into lmp-dev
...
* commit 'fa3fb593e89921402640bb780de8194bf637300d':
Add leanback support to AppCompatiblityTest
2014-09-18 21:19:48 +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
wsmlby
9632a07123
Merge "Add leanback support to AppCompatiblityTest" into lmp-dev
2014-09-18 21:11:16 +00:00
Christopher Tate
e7ad164045
am 6330e891: Merge "Log alarm delivery only when localLOGV" into lmp-dev
...
* commit '6330e8911f6d366e03a394a80c28c5ac5efc1abd':
Log alarm delivery only when localLOGV
2014-09-18 21:09:58 +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
wsmlby
e87cc9a2f2
Add leanback support to AppCompatiblityTest
...
Change-Id: Ia9da14b8551c4ec5834a047f0792a5a213a3ac04
2014-09-18 14:09:17 -07:00
Svetoslav
f14783bc51
am 5fe3bb76: am d972e2df: Merge "Print UI stuck when backing out of documents UI." into lmp-dev
...
* commit '5fe3bb76eb26707b096e20565a39fd3963c47134':
Print UI stuck when backing out of documents UI.
2014-09-18 20:57:34 +00:00
Christopher Tate
547f97ac93
Merge "Log alarm delivery only when localLOGV" into lmp-dev
2014-09-18 20:56:25 +00:00
Alan Viverette
50572be361
Merge "Fix parsing of old-style intent URIs" into lmp-dev
2014-09-18 20:54:44 +00:00
Christopher Tate
2ff5a73c3c
Log alarm delivery only when localLOGV
...
Logspam is spam.
Change-Id: I3bb63f3026fc6222eb8e1496b3a5db4cdf3c7f57
2014-09-18 13:47:57 -07:00
Alan Viverette
97f23981fc
am 73d3c81c: am fb15b0e2: Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev
...
* commit '73d3c81ce3ea5b3179b9ed7d0e4e0bbdf322ea66':
Use action bar theme for action modes, fix ViewStub inflation theme
2014-09-18 20:47:24 +00:00
Svetoslav
11549dd258
am d972e2df: Merge "Print UI stuck when backing out of documents UI." into lmp-dev
...
* commit 'd972e2dff33679a3c7fddd058396fd6437266709':
Print UI stuck when backing out of documents UI.
2014-09-18 20:46:14 +00:00
Jon Miranda
f78f17440c
am dff9c8b3: am bff124f1: Merge "Adds support for Theme dumping via DDM." into lmp-dev
...
* commit 'dff9c8b34a91bd099f659a7ab0534f6d4c393285':
Adds support for Theme dumping via DDM.
2014-09-18 20:37:46 +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
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