Dan Sandler
59f0258a27
Categorize some system notifications.
...
Change-Id: Ia343bc276f50f488e2165056cff249a02f01d45a
2014-03-26 01:31:04 +00:00
Adam Lesinski
d0c7a509cf
am a200414f: Merge "Use new build var to depend on an APKs resources"
...
* commit 'a200414ffe471fdec1a77ef11dae015614363ccb':
Use new build var to depend on an APKs resources
2014-03-26 00:47:15 +00:00
Adam Lesinski
a200414ffe
Merge "Use new build var to depend on an APKs resources"
2014-03-26 00:41:28 +00:00
Craig Mautner
9e829b1f15
am d7dc6f77: am 16744ac3: am d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev
...
* commit 'd7dc6f77f7bfc54d272f012fbe7d31ed181e430e':
Defer removal of activity until animation complete.
2014-03-26 00:37:45 +00:00
Craig Mautner
d7dc6f77f7
am 16744ac3: am d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev
...
* commit '16744ac3f7b030f1192d298132256ac06eaff205':
Defer removal of activity until animation complete.
2014-03-26 00:32:14 +00:00
Svetoslav
5b21d51d40
am 8a2b46d5: Merge "Wrong constant used for undefined accessibility window id."
...
* commit '8a2b46d535e28c102b972407faa866cd15246445':
Wrong constant used for undefined accessibility window id.
2014-03-26 00:31:42 +00:00
Svetoslav
8a2b46d535
Merge "Wrong constant used for undefined accessibility window id."
2014-03-26 00:28:27 +00:00
Svetoslav
cbcc9695f0
Wrong constant used for undefined accessibility window id.
...
Change-Id: I8b14db034a42a7ffd211a46fa3fee7bf2a6eac8f
2014-03-25 17:27:37 -07:00
Craig Mautner
16744ac3f7
am d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev
...
* commit 'd1e32cd3207215e8bb63f18c6a5a4880b5344ef8':
Defer removal of activity until animation complete.
2014-03-26 00:26:03 +00:00
Jean-Michel Trivi
dda1c4040c
Continue refactoring MediaFocusControl
...
Rename MediaController to PlayerRecord.
Change-Id: Icf474b4107649f501341309bf7ec520aa1e71586
2014-03-25 17:25:25 -07:00
Craig Mautner
d1e32cd320
Merge "Defer removal of activity until animation complete." into klp-modular-dev
2014-03-26 00:21:56 +00:00
Scott Main
8eb70c46ff
am da5c13eb: am 57be1303: am c3bcce59: am 01e68cab: am ad52a4ce: Merge "fix broken link" into klp-docs
...
* commit 'da5c13eb8ae00c853b269996c168ccb7191c4673':
fix broken link
2014-03-26 00:19:44 +00:00
Scott Main
da5c13eb8a
am 57be1303: am c3bcce59: am 01e68cab: am ad52a4ce: Merge "fix broken link" into klp-docs
...
* commit '57be13035205a32707df94ceaf055ffa334d2852':
fix broken link
2014-03-26 00:12:20 +00:00
Scott Main
57be130352
am c3bcce59: am 01e68cab: am ad52a4ce: Merge "fix broken link" into klp-docs
...
* commit 'c3bcce5907553c6f006fc2c0ac74383f01647827':
fix broken link
2014-03-26 00:05:17 +00:00
Adam Lesinski
b0569b98d5
Use new build var to depend on an APKs resources
...
Some other projects use LOCAL_APK_LIBRARIES and don't yet
work with the new shared library changes.
Change-Id: Ibb54bc1b5e3eb1252cf5b4e45249b089d25854ac
2014-03-25 17:04:56 -07:00
Scott Main
c3bcce5907
am 01e68cab: am ad52a4ce: Merge "fix broken link" into klp-docs
...
* commit '01e68cabb523440382ef3a02a512f8ce3b8af287':
fix broken link
2014-03-25 23:58:10 +00:00
Scott Main
01e68cabb5
am ad52a4ce: Merge "fix broken link" into klp-docs
...
* commit 'ad52a4ce9964508288316bfc5fb52833bf70b6a5':
fix broken link
2014-03-25 23:53:24 +00:00
Craig Mautner
79e6578b6c
Defer removal of activity until animation complete.
...
Do not remove an AppWindowToken or its Task if it is running an
animation. Doing so leaves windows orphaned and bad things happen
when the system tries to retrieve the task assoicated with the
windows during layout.
Fixes the ugly output associated with bug 13440426.
Change-Id: I9d5fc50a7cb6189160d51cee3c82f7813baee715
2014-03-25 16:48:47 -07:00
Scott Main
ad52a4ce99
Merge "fix broken link" into klp-docs
2014-03-25 23:47:00 +00:00
Scott Main
a8c29e19e4
fix broken link
...
Change-Id: If2f19d5c65372313860176808a3a0105f9fa118e
2014-03-25 16:45:40 -07:00
Jean-Michel Trivi
7d3168cef2
Continue refactoring of MediaFocusControl
...
Move RemoteControlClient death handler and remote playback state
inside MediaController class.
Make MediaController data fields private. Document which accessors
can be removed once the audio focus and media button receiver
mechanisms are dissociated.
Change-Id: Icd14fb0d99bf74512c8f8552d124c0353ce1f06d
2014-03-25 16:27:23 -07:00
Chris Craik
8c271ca63b
Add private circular reveal API on View/RenderNode
...
Change-Id: I139c8e12b354083149a665f6768f3f6931a8dd15
2014-03-25 16:03:48 -07:00
Ricardo Cervera
a9930ff1c0
am e535c1e5: am 8460e8ff: am 287b5bb2: am 64906b52: am 2564614c: am 39aed838: docs: Amend SDK release notes for 22.6.2
...
* commit 'e535c1e5872630eb4d0497c177d3e483f441ce48':
docs: Amend SDK release notes for 22.6.2
2014-03-25 23:02:04 +00:00
Will Haldean Brown
24c8ae6124
am a22b3857: am 7e98cee6: am f3f1c7a3: am 63d161e4: Merge "Remove all but two micro themes, light and dark." into klp-modular-dev
...
* commit 'a22b385777d4cc3b283a816bfc1c4e34329e72ce':
Remove all but two micro themes, light and dark.
2014-03-25 23:02:01 +00:00
Justin Koh
bb41b55f92
am 9a8afb1c: am d89929db: am c635ef99: am ec5b6e87: Merge "Add RobotoCondensed-Light to build." into klp-modular-dev
...
* commit '9a8afb1c3aaf49f7d2fae5033b0895ed7de06ce3':
Add RobotoCondensed-Light to build.
2014-03-25 23:01:58 +00:00
Ricardo Cervera
f7be507a5c
am 1f88794f: am 805f3fae: am 917a83da: am 7133208a: am 89a41db0: am 825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs
...
* commit '1f88794f41e75501301467c40030fdc12f4fddde':
docs: Added release notes for Android SDK 22.6.2
2014-03-25 23:01:54 +00:00
Chris Craik
5adec6184f
am e08f1669: am 72cf99ab: am 7e55b35a: am 4118480a: am 80470cdf: Merge "Solve three memory leaks related to PatchCache"
...
* commit 'e08f16695540009bed99a9b5c5147188edb496e6':
Solve three memory leaks related to PatchCache
2014-03-25 23:01:51 +00:00
Eino-Ville Talvala
aadca48c16
am 42004973: am 1559e0b6: (-s ours) am 63d61640: am 55a1e78f: am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev
...
* commit '42004973cde20cd883910db516571db220085c2c':
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
2014-03-25 23:01:48 +00:00
Craig Mautner
9470bc9318
am c9ef91a7: am f07788b9: am c89283c5: am d0955068: am 74e19f57: am 6f955df8: am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
...
* commit 'c9ef91a72f4c473d425b522c02ad74550f80b6da':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
2014-03-25 23:01:45 +00:00
Scott Main
3d2f353489
am 9a07a66b: am 1adb8947: am 1cf8117a: am dc18ce78: am 78373edb: am 837a4885: fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843
...
* commit '9a07a66ba9b159be465ca120296deaf4a31b369c':
fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843
2014-03-25 23:01:41 +00:00
Craig Mautner
57b7b9eacf
am 57889957: am ac21f995: am 4f61f6d4: am e187441b: Merge commit \'703169a3\' into manualmerge
...
* commit '578899571b6228c39dba5730f47317b183f73b4c':
Don't wait for finishing animation when second display is disconnected
2014-03-25 23:01:38 +00:00
Kenny Root
13250d8b18
am 6ab41d71: am 266de3ef: am dd3e6399: am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt"
...
* commit '6ab41d71eb9acbe07257c6cf208d662de82cc22e':
Use X509ExtendedTrustManager and not Conscrypt
2014-03-25 23:01:34 +00:00
Craig Mautner
4163b0fbf8
am 4abb86c0: am 732d5aaa: am 12b575bd: am 9bbd2f97: (-s ours) am 2cacc619: Merge "Don\'t wait for finishing animation when second display is disconnected"
...
* commit '4abb86c05dcdf5db69873ca484dc018b014e0eb4':
Don't wait for finishing animation when second display is disconnected
2014-03-25 23:01:30 +00:00
Baligh Uddin
367dc2bf27
am 561ffd24: (-s ours) am fe74cdcc: (-s ours) am 0a4bd7c9: (-s ours) am f3183062: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit '561ffd248fe67d9e583dd1b5dbf3deb7b02a394b':
Import translations. DO NOT MERGE
2014-03-25 23:01:28 +00:00
Craig Mautner
efc278fa3b
am 62143f2f: am 1df9bc5c: am d7bf82d6: am f32b22e9: resolved conflicts for merge of ca903d38 to klp-modular-dev
...
* commit '62143f2f17222f2a52928ef14597662982ff604d':
Move task to top in window manager.
2014-03-25 23:01:25 +00:00
Adam Lesinski
d96020ca6d
am 2471abec: am e77786d5: am 99d60784: am 415e6f8e: Merge "Fix issue with early service start" into klp-modular-dev
...
* commit '2471abec78a29b5a7b9b9e3e6c061f4be0964e9a':
Fix issue with early service start
2014-03-25 23:01:22 +00:00
Baligh Uddin
bb4fe4492d
am 0deb8ad6: (-s ours) am fbb3ae6c: (-s ours) am cdd07216: (-s ours) am 27f67d25: (-s ours) am 29526cca: (-s ours) am 89078012: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '0deb8ad6b2374b49012d35a91df105d06c1c0991':
Import translations. DO NOT MERGE
2014-03-25 23:01:18 +00:00
Narayan Kamath
f15a13bbfd
am a0eeb5e1: am 2c595209: am 163b8655: am ea96d791: am 5f0d44f6: Merge "Fix scaleNinePatch."
...
* commit 'a0eeb5e1720154bc11a6b1b96e9694cce599762b':
Fix scaleNinePatch.
2014-03-25 23:01:15 +00:00
Scott Main
7d1b337b9b
am 86a01f7c: am f71eebdb: am 686f041e: am 77dc3c00: am 27fa561f: am 52f449fd: fix size and behavior of video thumbnail when flash not available
...
* commit '86a01f7c56f30030fef56fa8c1ae28515693c894':
fix size and behavior of video thumbnail when flash not available
2014-03-25 23:01:12 +00:00
Ricardo Cervera
4b96ab23a1
am ba8169ac: am ba6bbb01: am addeab5c: am bd48af2c: am cd64a9ba: am 399b9994: docs: Added release notes for Google APIs System Image v4.
...
* commit 'ba8169ac46682ed73eff5c9d0d5d8f36aef646af':
docs: Added release notes for Google APIs System Image v4.
2014-03-25 23:01:09 +00:00
Matthew Williams
89d193d3cf
am 0826bcc9: am 2c672973: (-s ours) am 4bcf922a: am c798e4f5: am 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.
...
* commit '0826bcc95dd9a733c1f8f81fb3e737ce2460e629':
DO NOT MERGE: Downgrade expedited to normal on reschedule.
2014-03-25 23:01:04 +00:00
Scott Main
986afb1375
am 33f1338f: am b8a79fce: am 941eabc2: am e9b50e75: am 9d8184e7: am 779174ea: update wear homepage with layout fixes and replace GIFs with smaller versions
...
* commit '33f1338fbc93df1417fb2022ccd1fe75e82cabcd':
update wear homepage with layout fixes and replace GIFs with smaller versions
2014-03-25 23:01:01 +00:00
Selim Cinek
f5f1650011
am 92a87e30: am 50cd7c39: am f7805dd7: am 7290b56b: am 8ae8689d: am c41853ce: Fixed wallpaper bug where wrong size was taken when cropping
...
* commit '92a87e302625c69c6a52c3cb595b9ecfacf29129':
Fixed wallpaper bug where wrong size was taken when cropping
2014-03-25 23:00:58 +00:00
Gabriel Peal
f285367359
am f53d1a01: Merge "resolved conflicts for merge of c1edfc2c to master"
...
* commit 'f53d1a01972d04402b48476d6a8173285516edd3':
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
2014-03-25 23:00:55 +00:00
Zhijun He
725f9e13d6
am aaad0047: Merge "Camera2: Add partial flash state"
...
* commit 'aaad0047a6c2e7478312b85ebab275a3578ec4c2':
Camera2: Add partial flash state
2014-03-25 23:00:51 +00:00
Adam Lesinski
7f920c2245
am 7f3b7116: Merge "Shared library resource support"
...
* commit '7f3b7116b78ca108f64ca2f5d57515793ef9fd02':
Shared library resource support
2014-03-25 23:00:48 +00:00
Gabriel Peal
70054d15df
am db0dca82: resolved conflicts for merge of c1edfc2c to master
...
* commit 'db0dca826d992af1adfa53e10c31f08d3197bb0b':
resolved conflicts for merge of c1edfc2c to master
2014-03-25 23:00:43 +00:00
Gabriel Peal
d5bb948acf
am 5e44cadf: Merge "resolved conflicts for merge of c1edfc2c to master"
...
* commit '5e44cadfd69c210c11f80cfe599718617a0e6676':
resolved conflicts for merge of c1edfc2c to master
2014-03-25 23:00:40 +00:00
Baligh Uddin
66963a8ce3
am 05f79758: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '05f79758cd2688f89444a38baba326a0a1c1a438':
Import translations. DO NOT MERGE
2014-03-25 23:00:37 +00:00
Baligh Uddin
50998a8cf1
am 449616f9: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '449616f9aeff15db215e57e688a3190421e29e55':
Import translations. DO NOT MERGE
2014-03-25 23:00:34 +00:00