Erik Kline
95b5ca9019
am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
...
* commit '9261d9d64548f0221de50eb99f3675488a4176a4':
Remove CONNECTIVITY_CHANGE_DELAY and friends.
2014-12-04 15:16:04 +00:00
Cheuksan Wang
dba26aa2e7
am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
...
* commit '109ec376da86de1275f73fa432d6344431a457e9':
new SMS/MMS carrier app API
2014-12-04 15:15:33 +00:00
John Reck
a51a0901ad
am bd15e4f5: Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev
...
* commit 'bd15e4f59c0ac4386ad11ba1555e41cb32d3a52c':
Resume RT-animations after a pauseSurface
2014-12-04 15:15:27 +00:00
Christopher Tate
e808d2df76
am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev
...
* commit '758f45217d9b7d257258ea41aa53f6364ac13918':
Adjust wallpaper-restore acceptance criteria
2014-12-04 15:14:43 +00:00
Erik Kline
9261d9d645
Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
2014-12-04 03:14:02 +00:00
Cheuksan Wang
109ec376da
Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
2014-12-04 00:19:06 +00:00
John Reck
bd15e4f59c
Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev
2014-12-04 00:08:16 +00:00
Christopher Tate
758f45217d
Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev
2014-12-03 23:09:34 +00:00
Eino-Ville Talvala
6e21817b8e
am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev
...
* commit 'd23f8b44d575dcdc00965aae5fffd97f0336df43':
Revert "Camera: Add new capability flags as system features as well"
2014-12-03 23:00:15 +00:00
Eino-Ville Talvala
d23f8b44d5
Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev
2014-12-03 22:01:42 +00:00
Dianne Hackborn
e6333e5188
am f696efa2: Merge "Fix issue #17948584 : Application crash and phone restart when app..." into lmp-mr1-dev
...
* commit 'f696efa206089bde1274d972239ffb5a8185f613':
Fix issue #17948584 : Application crash and phone restart when app...
2014-12-03 21:38:08 +00:00
Dianne Hackborn
f696efa206
Merge "Fix issue #17948584 : Application crash and phone restart when app..." into lmp-mr1-dev
2014-12-03 21:32:17 +00:00
Christopher Tate
31f25696d9
Adjust wallpaper-restore acceptance criteria
...
Previously the dimension check had implicit orientation sensitivity.
We now make sure to compare the candidate image's width to the smallest
screen dimension for acceptance purposes; this fixes cases when we would
e.g. get a restored image of (1680x2560) but believe that we needed it
to have a max width of 2048, even though it had originated on that same
device -- due to current-orientation issues.
Bug 18448052
Change-Id: I64ca6a4ed91ce1ccc04f5a9a6851e5cfe511b7c7
2014-12-03 13:07:24 -08:00
John Reck
01a5ea35fb
Resume RT-animations after a pauseSurface
...
Bug: 18203577
The issue occurs as a result of performTraversals() both doing
a window relayout call *and* early-returning because it's not dirty.
To fix this pauseSurface() returns whether or not the RT-side is
"dirty" to force ViewRootImpl to do a draw even if mDirty is
otherwise empty.
Change-Id: I534f367e75d18d273ebf14df3927f5c464ef6bef
2014-12-03 13:03:59 -08:00
Yin-Chia Yeh
871571ae0c
am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev
...
* commit '381343088f964b6428c483f741424a50ef41cb49':
Camera: update antibanding spec
2014-12-03 20:54:23 +00:00
Yin-Chia Yeh
381343088f
Merge "Camera: update antibanding spec" into lmp-mr1-dev
2014-12-03 20:44:05 +00:00
Sreeram Ramachandran
95e4474c70
am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev
...
* commit '932c33214729fe2d2b09f82ef60a72871f182654':
Fix docs per API review.
2014-12-03 19:50:19 +00:00
Etan Cohen
89b55fc52d
am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place)
...
* commit '7ab0ad1ffe858dbf82d5c3b540c02488f31c51f0':
Add a global override for VoLTE calls (which leaves user setting in place)
2014-12-03 19:50:13 +00:00
Sreeram Ramachandran
932c332147
Merge "Fix docs per API review." into lmp-mr1-dev
2014-12-03 19:15:38 +00:00
Eino-Ville Talvala
08a125562c
Revert "Camera: Add new capability flags as system features as well"
...
This reverts commit 6aee1d2ba5 .
But leaves in some of the improved documentation.
Bug: 18281970
Bug: 18573576
Change-Id: I320f2229456ac039bc8f3cd8bc8b4ea6cf0e80eb
2014-12-03 11:12:39 -08:00
Etan Cohen
7ab0ad1ffe
Add a global override for VoLTE calls (which leaves user setting in place)
...
Bug: 18446228
Change-Id: I7d07f066e5933c2aeecf9222bb54da69975099bc
2014-12-03 18:56:45 +00:00
Sreeram Ramachandran
9e956e9b9a
Fix docs per API review.
...
Bug: 18573918
Change-Id: I639fe2ce40cdef57d904b9ad1ebb28db7d057144
2014-12-03 10:53:35 -08:00
Winson Chung
5051109699
am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev
...
* commit 'de9848c641e1b1e0f73e5655c3f8c0c3b34a011c':
Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
2014-12-03 18:36:15 +00:00
Dianne Hackborn
bedd1744b2
am ef44c051: Merge "Work on issue #18572506 : AppOps in-memory state is invalid after..." into lmp-mr1-dev
...
* commit 'ef44c0514d497a789dca4731da61a2cf49bb3289':
Work on issue #18572506 : AppOps in-memory state is invalid after...
2014-12-03 18:35:46 +00:00
Dianne Hackborn
1bc177c585
Fix issue #17948584 : Application crash and phone restart when app...
...
...is installed with <provider> with empty string.
Don't allow empty authorities, just like we don't allow null authorities.
Change-Id: I5c64592a639efe4dba848bd6f0efe4257f1565a2
2014-12-03 10:20:30 -08:00
Winson Chung
de9848c641
Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev
2014-12-03 18:10:38 +00:00
Dianne Hackborn
ef44c0514d
Merge "Work on issue #18572506 : AppOps in-memory state is invalid after..." into lmp-mr1-dev
2014-12-03 18:03:27 +00:00
Dianne Hackborn
7b7c58b384
Work on issue #18572506 : AppOps in-memory state is invalid after...
...
...uninstalling updates to a system app
Things seem to be working fine, however we were not as aggressive at
writing out the current state in this case as we probably should be.
Also introduce more features to the appops command, which are useful
for testing this.
Change-Id: I177a9cc0e16e98b76fee0d052d742e06842bb3f9
2014-12-03 10:01:14 -08:00
Lorenzo Colitti
d99cd44f31
am dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev
...
* commit 'dc99c50427ec700fa4b4191b92f0132cf7238c4b':
Make StatusBar display all default networks.
2014-12-03 17:18:52 +00:00
Lorenzo Colitti
dc99c50427
Merge "Make StatusBar display all default networks." into lmp-mr1-dev
2014-12-03 06:58:10 +00:00
Filip Gruszczynski
0821a56668
am f675cad8: am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev
...
* commit 'f675cad8f5f5781a29ccd733570d90bae3fe8d84':
Add overscan insets to surface frame dimensions in WallpaperService.
2014-12-03 02:59:35 +00:00
Filip Gruszczynski
f675cad8f5
am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev
...
* commit '6e854ce5728086b3bd293cb37bd83ebeef52aca8':
Add overscan insets to surface frame dimensions in WallpaperService.
2014-12-03 02:53:41 +00:00
Filip Gruszczynski
6e854ce572
Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev
2014-12-03 02:23:33 +00:00
Alan Viverette
bb241c3cde
am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev
...
* commit '4eb2e04f4d3eafdf56840a0988dd730dc433478d':
Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
2014-12-03 02:18:12 +00:00
George Mount
24fac506f0
am 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev
...
* commit '561261d4442fb78b314c00f6b836fe7b1c387977':
Keep snapshot order matching the shared elements.
2014-12-03 02:17:58 +00:00
Filip Gruszczynski
a2838dfc2c
Add overscan insets to surface frame dimensions in WallpaperService.
...
Bug: 18595832
Change-Id: Ia5a03cc5e059153d76907627ee0811b0851e35ed
2014-12-02 17:23:41 -08:00
Alan Viverette
4eb2e04f4d
Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev
2014-12-03 00:43:47 +00:00
Alan Viverette
9752428dc1
Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
...
Using CURRENT isn't always safe.
BUG: 18557273
Change-Id: I12e197ab25b8ffdc04c5e74836945177870698a2
2014-12-02 16:24:24 -08:00
George Mount
561261d444
Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev
2014-12-03 00:13:28 +00:00
Alan Viverette
a6779bc517
am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev
...
* commit '9a888816de21c4e146acbd608fdea110a299f42d':
Deprecate one-arg getDrawableForDensity, update currents.txt
2014-12-02 23:37:47 +00:00
Winson Chung
740c3ac782
Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
...
Add a listener to listen for changes in the Task stacks to preload thumbnails from the
system. In addition, reduce the amount of synchronous work done in activity creation
and first measure/layout passes.
Change-Id: I8bd9155d7a05e89c190a20429acff69a17808208
2014-12-02 15:34:20 -08:00
Alan Viverette
a6f8b2ce55
Deprecate one-arg getDrawableForDensity, update currents.txt
...
BUG: 18579576
Change-Id: I7df6ec2952ab121e2be8ae0a016ccf36f6fba2ff
2014-12-02 15:26:33 -08:00
Alan Viverette
63c7a655be
am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev
...
* commit '1b33396ee4047e79777495a8682b9117e88bba5c':
Deprecate Resources.getDrawable(int) in favor of the two-arg version
2014-12-02 23:11:36 +00:00
Alan Viverette
c10e3960d9
Deprecate Resources.getDrawable(int) in favor of the two-arg version
...
This is a landmine for developers. If they need to obtain an unthemed
drawable, they should be using an explicit null theme.
BUG: 18579576
Change-Id: Ibca6b4c3e8e50dca144571244e035caec6fa91f8
2014-12-02 14:58:08 -08:00
George Mount
92692c0284
Keep snapshot order matching the shared elements.
...
Bug 18578796
When no snapshot was created, we weren't adding anything to
the snapshot list. When a snapshot is not created, we should
add an null snapshot to the snapshot list to keep them in
order.
Change-Id: I522e485163229230037dcdd635b83cff800df28f
2014-12-02 14:31:31 -08:00
Dianne Hackborn
2f58bab7b0
am 221b545c: Merge "Fix issue #18510117 : Returning from an activity started with..." into lmp-mr1-dev
...
* commit '221b545cdaba2522fbb299428ac048641410c284':
Fix issue #18510117 : Returning from an activity started with...
2014-12-02 19:33:28 +00:00
Kweku Adams
fa99c345c4
am d537987b: Changing AUDIO_TURNED_ON constant.
...
* commit 'd537987b173f6b48f5196a2ae7d445af1a49e2bb':
Changing AUDIO_TURNED_ON constant.
2014-12-02 19:33:23 +00:00
Dianne Hackborn
221b545cda
Merge "Fix issue #18510117 : Returning from an activity started with..." into lmp-mr1-dev
2014-12-02 19:22:07 +00:00
Kweku Adams
d537987b17
Changing AUDIO_TURNED_ON constant.
...
Changed so that it's set to a different value from WIFI_MULTICAST_ENABLED.
Change-Id: Ied3a2c2bf891f887ec3c7b5249453af4524c099a
2014-12-02 19:18:13 +00:00
Christoph Studer
cd9eb9bee7
am 27ef0188: Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev
...
* commit '27ef018846fc88122bcb2c30ba86e99a5b3039d6':
NoMan/SysUI: Clear LEDs only when entering the shade
2014-12-02 18:59:26 +00:00