Sreeram Ramachandran
16d75742fc
am 3a8fbb80: am 95e4474c: am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev
...
* commit '3a8fbb8072f564c6da9b7655c1c90b26670d2f12':
Fix docs per API review.
2014-12-03 21:51:05 +00:00
Etan Cohen
64d3c1402a
am a2ab707c: am 89b55fc5: am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place)
...
* commit 'a2ab707c87b8129873078dcea8effdd970de67c3':
Add a global override for VoLTE calls (which leaves user setting in place)
2014-12-03 21:51:00 +00:00
Winson Chung
3b8887d540
am fee5e3d3: am 50511096: am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev
...
* commit 'fee5e3d32a26c3ac2136e37cad15fd9cc41066db':
Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
2014-12-03 21:50:36 +00:00
Dianne Hackborn
98866d1179
am b46e9da6: am bedd1744: am ef44c051: Merge "Work on issue #18572506 : AppOps in-memory state is invalid after..." into lmp-mr1-dev
...
* commit 'b46e9da64c51bcbfdd21b8e18850064eeb50d930':
Work on issue #18572506 : AppOps in-memory state is invalid after...
2014-12-03 21:50:10 +00:00
Lorenzo Colitti
41762ecac0
am 45cd4df6: am d99cd44f: am dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev
...
* commit '45cd4df6a0915558efa6bf4ec9c61fadff70572f':
Make StatusBar display all default networks.
2014-12-03 21:49:38 +00:00
Filip Gruszczynski
9da0c5e647
am 35a2d360: am 0821a566: am f675cad8: am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev
...
* commit '35a2d36085f4b4063fa5c91ad575660e009d1e3d':
Add overscan insets to surface frame dimensions in WallpaperService.
2014-12-03 21:49:33 +00:00
Sreeram Ramachandran
3a8fbb8072
am 95e4474c: am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev
...
* commit '95e4474c7069bdd85178aab96182bc0088b43a70':
Fix docs per API review.
2014-12-03 20:43:50 +00:00
Etan Cohen
a2ab707c87
am 89b55fc5: am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place)
...
* commit '89b55fc52d0ad20013353af32e7d4823d95db575':
Add a global override for VoLTE calls (which leaves user setting in place)
2014-12-03 20:43:46 +00:00
Winson Chung
fee5e3d32a
am 50511096: am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev
...
* commit '50511096998ffff4fa5c001e46b056201fb0b892':
Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
2014-12-03 20:42:45 +00:00
Dianne Hackborn
b46e9da64c
am bedd1744: am ef44c051: Merge "Work on issue #18572506 : AppOps in-memory state is invalid after..." into lmp-mr1-dev
...
* commit 'bedd1744b2afa0ede3ab7ac38a0e4a2111ed53bf':
Work on issue #18572506 : AppOps in-memory state is invalid after...
2014-12-03 20:42:17 +00:00
Lorenzo Colitti
45cd4df6a0
am d99cd44f: am dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev
...
* commit 'd99cd44f317a0e1b188a0033ebe4948f13c32491':
Make StatusBar display all default networks.
2014-12-03 20:41:10 +00:00
Filip Gruszczynski
35a2d36085
am 0821a566: am f675cad8: am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev
...
* commit '0821a56668aa0289b137eb510f35aed54784dc3b':
Add overscan insets to surface frame dimensions in WallpaperService.
2014-12-03 20:40:56 +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
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
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
Tor Norbye
0ab6472237
Merge "Add BIND_IMPORTANT to @BindServiceFlags"
2014-12-03 17:38:41 +00:00
Alan Viverette
d02bc7c5a8
am 4483f461: am bb241c3c: am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev
...
* commit '4483f4611ee002b57f851aa3268ff610023c72c5':
Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
2014-12-03 17:18:53 +00: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
George Mount
699a77e553
am a3a53251: am 24fac506: am 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev
...
* commit 'a3a53251f1dfdd3620bfa9b0a8f350a9867826d9':
Keep snapshot order matching the shared elements.
2014-12-03 17:18:38 +00:00
Alan Viverette
4483f4611e
am bb241c3c: am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev
...
* commit 'bb241c3cdedb96d2a3a61e913102d6186f12103a':
Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
2014-12-03 07:56:12 +00:00
George Mount
a3a53251f1
am 24fac506: am 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev
...
* commit '24fac506f0204433aa3d2314d3ac7f909b6eb67a':
Keep snapshot order matching the shared elements.
2014-12-03 07:56:00 +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
f50644f22b
am 6c23ba0d: am a6779bc5: am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev
...
* commit '6c23ba0d8d39aed98197071c7cf9ffc0b6c633b5':
Deprecate one-arg getDrawableForDensity, update currents.txt
2014-12-03 00:31:33 +00:00
Alan Viverette
1eb35de522
am 0cd6296c: am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev
...
* commit '0cd6296c0afb92f63487247ef4c9c73715113926':
Deprecate Resources.getDrawable(int) in favor of the two-arg version
2014-12-03 00:31:13 +00:00
Adam Lesinski
625fa573b4
am 9438ad15: am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c
...
* commit '9438ad1599716176fb6c593e77a2e93b265bbcb5':
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets
2014-12-03 00:30:56 +00:00
Chris Wren
83cb9cad31
am 723bce8a: am 47a5cb12: am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes"
...
* commit '723bce8a0d4fa900ca4344c03e5e82b5881fcf19':
Keep deleteIntent when copying Notification attributes
2014-12-03 00:30:44 +00:00
Alan Viverette
5c39807a57
am 73d28900: resolved conflicts for merge of 850cdbe5 to lmp-mr1-dev-plus-aosp
...
* commit '73d28900e96b84b2833954669f1db95326f3d6e0':
Consider RTL layout in DPAD navigation in AbsSeekBar
2014-12-03 00:29:46 +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
6c23ba0d8d
am a6779bc5: am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev
...
* commit 'a6779bc51772aae2ba4cc94db2ae47b76a2cc972':
Deprecate one-arg getDrawableForDensity, update currents.txt
2014-12-02 23:45:25 +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
0cd6296c0a
am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev
...
* commit '63c7a655beab21da934d21bb4004889bfb6e4417':
Deprecate Resources.getDrawable(int) in favor of the two-arg version
2014-12-02 23:19:28 +00: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
Adam Lesinski
9438ad1599
am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c
...
* commit 'e580d6617f67a1db5eff7ffe5450684cfc7e1a2b':
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets
2014-12-02 23:07:43 +00:00