Christopher Tate
d7e1685128
Merge "Use the right package name for MountServiceIdler"
2014-06-17 21:46:58 +00:00
Christopher Tate
f8ad7a9094
Use the right package name for MountServiceIdler
...
Manifest package != .java "package" decl for system process entities.
Change-Id: I162f8fed6b62b27d056049b55f77e776090a4c80
2014-06-17 15:07:01 -07:00
Robin Lee
6d3912e2ef
Merge "Revert "Publish DevicePolicyManager CA certificate APIs""
2014-06-17 21:55:55 +00:00
Robin Lee
2b5e917026
Revert "Publish DevicePolicyManager CA certificate APIs"
...
This reverts commit 5260bf69946563dc47c17e7441b352adfce384c5.
Change-Id: I5e44fdac8a7375576b25171f58e31a1fa0e3c569
2014-06-17 22:12:28 +00:00
Svetoslav
6170cca05e
Not touchable windows should not hide windows behind
...
When computing which windows to report for accessibility we were not
reporting windows behind non touchable ones. However, if a window is
not-touchable the touch events go to the window behind it. Hence, a
not-touchable window should not affect the reproted windows for
accessibility.
Change-Id: I213a32b33b0986a73d8bbdf0a3e40e6ca6e4261b
2014-06-17 14:54:39 -07:00
Alan Viverette
1f681448c6
Merge "Add attributes and accessors for tinting View drawables"
2014-06-17 20:42:58 +00:00
Alan Viverette
911743652b
Add attributes and accessors for tinting View drawables
...
Also cleans up handling in setters for managed drawables.
BUG: 15391544
Change-Id: Idc08f7eaea0050feb6403566985a6d58185b81f8
2014-06-17 14:51:45 -07:00
Selim Cinek
aebc0cd596
Merge "Fixed a bug with overscrolling on the bottom."
2014-06-17 20:42:58 +00:00
John Reck
b65f0d5f08
Merge "Fix setLayerType"
2014-06-17 21:13:21 +00:00
John Reck
ca0608af3c
Fix setLayerType
...
Bug: 15682142
mLayerType/getLayerType() can modify the display list, so invalidate()
is necessary
Change-Id: I1d323c1bd4356b31159b51d4299de099e53a0389
2014-06-17 14:39:15 -07:00
Selim Cinek
fed1ab6222
Fixed a bug with overscrolling on the bottom.
...
When overscrolling on the buttom, we now take the normal rubberband
factor again.
Change-Id: I615c84ee925b69d1ee995a56ffb2e4291c18c43d
2014-06-17 14:10:33 -07:00
Christopher Tate
5b2034e2cc
Merge "Switch everything to scheduled jobs"
2014-06-17 20:55:27 +00:00
Christopher Tate
564054146e
Merge "Tweak restore API"
2014-06-17 20:55:27 +00:00
Christopher Tate
6a49dd087f
Tweak restore API
...
We need the transport to tell the system not only what package it's going
to deliver data for next, but also what format that data is in.
Change-Id: I989cf78febf923a4208acb33ed80ccc7869356f5
2014-06-17 14:29:09 -07:00
Brian Attwell
9cf22309e0
Merge "Remove FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET"
2014-06-17 20:49:29 +00:00
Brian Attwell
2aa1549f4d
Remove FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
...
Reasons
1) Now that QC is no longer a modal dialog, it doesn't make sense for
to use FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET. We want QC to stick around
inside the back stack.
2) FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET is deprecated. It now behaves
completely differently than it used to. It now acts the same as
FLAG_ACTIVITY_NEW_DOCUMENT.
Bug: 15693551
Change-Id: Ia22fe04d7a91876061498bf1f098755b54199704
2014-06-17 21:25:06 +00:00
Jim Miller
cd589baba9
Merge "First pass at FingerprintService integration with HAL. Move FingerprintService to framework services directory Fix merge conflicts."
2014-06-17 21:07:42 +00:00
Jim Miller
a7596147b4
First pass at FingerprintService integration with HAL.
...
Move FingerprintService to framework services directory
Fix merge conflicts.
Tested: scanning, enrolling, removing.
Change-Id: I58b2b902cb671dc82cdaa54a195ba5f1a154622c
2014-06-17 14:03:37 -07:00
Chris Craik
96401d9995
Merge "Added primitive parameters to various functions requiring rectangles."
2014-06-17 20:42:58 +00:00
Chris Craik
75af3f3c96
Merge "Add abort logging for huge scales and tessellation recursion depth"
2014-06-17 20:49:29 +00:00
Adam Lesinski
afc00e1c81
Change am get-config command to use ABI string array
...
There is a list of supported ABIs in android.os.Build which
is ordered by preference. This is a more flexible list to use
instead of 2 fixed ABIs.
Change-Id: I6aa3b39b5ffa888ed83a870b937e18328dd6de39
2014-06-17 20:27:39 +00:00
Antonio Calabrese
2460958133
Added primitive parameters to various functions requiring rectangles.
...
Change-Id: I5a2678fa989f0ff34404b8236787a8153b05f113
bug:14322352
2014-06-17 20:17:59 +00:00
Yuhao Zheng
3bcbf38e7d
Passpoint OSU bug fix + API rename
...
- OSU bug fix
- API rename
Change-Id: Ic4a09d53177e5c6a81269da7208841d4c6f02716
2014-06-17 12:56:02 -07:00
Chris Craik
fe02b4b344
Add abort logging for huge scales and tessellation recursion depth
...
bug:15615144
Change-Id: I275732eb97f9d5179beed23eecd2ee3cc7112e10
2014-06-17 12:23:29 -07:00
Christopher Tate
cf1a2f73fc
Switch everything to scheduled jobs
...
Everything that used the IdleMaintenance APIs/broadcasts gets to use the
spiffy new JobScheduler instead. Hooray!
On top of that, the now-obsolete "idle maintenance" APIs are now gone
entirely. Double hooray!
Bug 14993295
Change-Id: I5fb67c296ca8cd0ba8a2c8760a0f0d9d962d813b
2014-06-17 12:14:45 -07:00
Richard Coles
2995606963
Merge "Connect WebView Async Cookie APIs"
2014-06-17 05:13:46 +00:00
Hector Dearman
24a11d311c
Connect WebView Async Cookie APIs
...
Bug: 14379829
Change-Id: I6b0e0644153a805eccb48d30b0ad3e91babd8093
2014-06-17 15:32:07 +01:00
Baligh Uddin
0f8f45edad
am 3358b9fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
...
* commit '3358b9fe124a192a1775630d57485bcdec16069d':
Import translations. DO NOT MERGE
2014-06-17 14:30:19 +00:00
Baligh Uddin
d99d5e098f
am 1d96174c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
...
* commit '1d96174cd57699272fb6dd9abf08599acc6ce8d0':
Import translations. DO NOT MERGE
2014-06-17 14:30:14 +00:00
George Mount
b960752328
Merge changes Id7ae3838,I8e297443
...
* changes:
Fix NPE when shared elements are empty.
Allow antroid.transition Transitions in fragments.
2014-06-17 05:00:50 +00:00
George Mount
4d994261e9
Fix NPE when shared elements are empty.
...
Bug 15608384
Change-Id: Id7ae383873d8d09b51d9c680942076a3a8ffea5b
2014-06-17 20:45:31 +00:00
George Mount
d4c3c91dd0
Allow antroid.transition Transitions in fragments.
...
Bug 15274281
Bug 15189829
Change-Id: I8e2974430b84a611866fe20afe1f5745e803683f
2014-06-17 20:24:16 +00:00
Baligh Uddin
22669d0024
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
2014-06-17 05:00:50 +00:00
Baligh Uddin
281b14eea0
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
2014-06-17 04:56:28 +00:00
Baligh Uddin
d31899bb76
Merge "Import translations. DO NOT MERGE"
2014-06-17 04:56:28 +00:00
Baligh Uddin
f67ce362cf
Merge "Import translations. DO NOT MERGE"
2014-06-17 05:00:50 +00:00
Jungshik Jang
3ecdd832c7
Fix missing iteration policy on device discover action
...
Device polling requires both pick policy and pick iteration policy,
however, device discovery action has no iteration policy.
Along with fix, move send result and pick policy constants
to HdmiConstants package
Change-Id: Ibbcfdc482a189bbc3aa2c61143422541da78447d
2014-06-17 14:04:38 +09:00
Sai Cheemalapati
e54a764cfd
Merge "Adds speakerphone extra to ACTION_DIAL (2/2)."
2014-06-17 04:50:03 +00:00
Sai Cheemalapati
0f0bcb5ac5
Adds speakerphone extra to ACTION_DIAL (2/2).
...
If optional extra EXTRA_SPEAKERPHONE_ON is added
to an ACTION_DIAL intent, the speakerphone will turn
on automatically once the call is connected.
Bug: 6810980
Change-Id: Ie4e1c5b413e72f9b0dbd590384571147a43a11ac
2014-06-17 11:54:05 -07:00
Anish Athalye
a4649d95fe
Merge "Implement Paint.breakText() using Minikin"
2014-06-17 04:50:03 +00:00
Robert Ly
31f8d22ec5
am 1d3f9b72: am 0bfee5a4: Merge "fix javadocs b/14414251" into klp-modular-dev
...
* commit '1d3f9b72505cdf72889f9f1984005097ed35d314':
fix javadocs b/14414251
2014-06-17 19:31:43 +00:00
Robert Ly
1d3f9b7250
am 0bfee5a4: Merge "fix javadocs b/14414251" into klp-modular-dev
...
* commit '0bfee5a4905a14a318731661214558792abc2f7d':
fix javadocs b/14414251
2014-06-17 19:26:48 +00:00
Adam Lesinski
7efc0eb163
am f5cb96cf: am 51736de1: am 4c488cca: Merge "[Asset Manager] Fix memory leakage bug"
...
* commit 'f5cb96cfbbd2a7148b4b337097c94bea3f52d5f3':
[Asset Manager] Fix memory leakage bug
2014-06-17 19:21:56 +00:00
Adam Lesinski
f5cb96cfbb
am 51736de1: am 4c488cca: Merge "[Asset Manager] Fix memory leakage bug"
...
* commit '51736de19a4c225a54cda73754d0f57aa68def4f':
[Asset Manager] Fix memory leakage bug
2014-06-17 19:13:58 +00:00
Adam Lesinski
51736de19a
am 4c488cca: Merge "[Asset Manager] Fix memory leakage bug"
...
* commit '4c488cca531f209921cc4dfbc27ff7cdecfda71b':
[Asset Manager] Fix memory leakage bug
2014-06-17 19:08:50 +00:00
smain@google.com
aa3ebacd4f
am dc9f74a5: misc cleanup to the SDK install steps
...
* commit 'dc9f74a567f7997db669d8a48f1c79a10ae4fd2e':
misc cleanup to the SDK install steps
2014-06-17 18:10:24 +00:00
smain@google.com
dc9f74a567
misc cleanup to the SDK install steps
...
Change-Id: I76cb566d20d134b6ba6d63ab5adb689d6bbfc0e5
2014-06-17 11:03:51 -07:00
Griff Hazen
6762a3351c
am 831ca9d3: Document best practices for display intent activities.
...
* commit '831ca9d3bc73e37f555f6c07babde270f83044fe':
Document best practices for display intent activities.
2014-06-17 16:20:30 +00:00
Griff Hazen
831ca9d3bc
Document best practices for display intent activities.
...
Bug: 15412926
Change-Id: I1c3082dfde85cd03ffc97be6383a0608f925edcf
2014-06-17 00:38:38 -07:00
Adam Lesinski
4c488cca53
Merge "[Asset Manager] Fix memory leakage bug"
2014-06-17 05:00:50 +00:00