Matthew Williams
86f4b37d19
Merge "Refactor SyncManager rename authority->target"
2013-09-16 18:29:36 +00:00
Chet Haase
f6e1e8e037
am fe11c5d8: am 978a455d: Merge "Plug leaks in transitions" into klp-dev
...
* commit 'fe11c5d8cd02897b5156460c9a7ae6578cad1fc6':
Plug leaks in transitions
2013-09-16 11:13:01 -07:00
Chet Haase
fe11c5d8cd
am 978a455d: Merge "Plug leaks in transitions" into klp-dev
...
* commit '978a455d665c6bccdc900eeadc72bb652a2ea294':
Plug leaks in transitions
2013-09-16 11:10:34 -07:00
Chet Haase
978a455d66
Merge "Plug leaks in transitions" into klp-dev
2013-09-16 18:05:43 +00:00
Martijn Coenen
0754cb7586
am 1f8d7f61: am 370b593c: Merge "Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE." into klp-dev
...
* commit '1f8d7f61c07faa7ad566fe2329dcf7923f6221d0':
Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE.
2013-09-16 10:37:45 -07:00
Martijn Coenen
1f8d7f61c0
am 370b593c: Merge "Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE." into klp-dev
...
* commit '370b593c37569ddad8286a47e3772bfe3cdb9c9b':
Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE.
2013-09-16 10:34:35 -07:00
Martijn Coenen
370b593c37
Merge "Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE." into klp-dev
2013-09-16 17:31:40 +00:00
Jonathan Dixon
a25f350add
am 7c0e2122: Merge "Revert "Hide Experimental WebView from dev settings" DO NOT MERGE" into klp-dev
...
* commit '7c0e2122c0e9bcb83c082156d5f5300b7f62169b':
Revert "Hide Experimental WebView from dev settings" DO NOT MERGE
2013-09-15 20:34:31 -07:00
Jonathan Dixon
1dd56b656b
am c39a9ca9: Merge "Hide Experimental WebView from dev settings DO NOT MERGE" into klp-dev
...
* commit 'c39a9ca95d98e70fc1de8a1b3aeaf7e7075ff868':
Hide Experimental WebView from dev settings DO NOT MERGE
2013-09-15 20:29:55 -07:00
Jonathan Dixon
dc1573595c
Revert "Hide Experimental WebView from dev settings" DO NOT MERGE
...
Bug 10769282
Reverting temporary patch required for factory rom.
This reverts commit 292fd0351be8f414cbe32a7eb322bd18158685d9.
2013-09-16 03:09:43 +00:00
Jonathan Dixon
3d458ab916
Hide Experimental WebView from dev settings DO NOT MERGE
...
Bug 10427705
The persist.webview system property is no longer needed, so removed too.
Change-Id: I99bbf2e9b9ec42f282339c72509fd99b18594ebf
2013-09-16 03:08:41 +00:00
Svetoslav Ganov
a6df7120f4
am b30e185b: am 4244d66a: Merge changes Id0a67846,I20b57d66 into klp-dev
...
* commit 'b30e185b440e04eac5119653a2868395554febfe':
Print system may get stuck bound to a print service
Spooler should not crash if print service config activities are not exported.
2013-09-15 11:50:44 -07:00
Svetoslav Ganov
b30e185b44
am 4244d66a: Merge changes Id0a67846,I20b57d66 into klp-dev
...
* commit '4244d66a122258adc86a8d757d3fe5f9588a59f8':
Print system may get stuck bound to a print service
Spooler should not crash if print service config activities are not exported.
2013-09-15 11:48:10 -07:00
Svetoslav Ganov
4244d66a12
Merge changes Id0a67846,I20b57d66 into klp-dev
...
* changes:
Print system may get stuck bound to a print service
Spooler should not crash if print service config activities are not exported.
2013-09-15 18:46:02 +00:00
Ying Wang
8d2373810a
am 3c9d0490: am c38acbbe: Merge "Fix docs build." into klp-dev
...
* commit '3c9d049084c6a5d5033cbf6cccee30177508267f':
Fix docs build.
2013-09-14 12:06:30 -07:00
Chet Haase
7660d121b2
Plug leaks in transitions
...
Transitions were leaking views due to TransitionsValues holding references
to views/parents. The references were fine, but the retention of the transition
objects themselves were not. There were a few different places that needed to
be plugged:
- clones were not making new copies of some fields, leading to caching references
in the original object (which was then cloned later to other clones)
- Visibility was using a persistent field to cache temporary values. This transition,
when cloned, would retain these instances, keeping references to views
- ViewTreeObserver had a bug that would leak listeners
Issue #10749071 Activity instance leak between TransitionManager and InputMethodManager
Change-Id: I1d5d457dc5e020c7b9e8392a95e3b2c488461119
2013-09-14 12:06:18 -07:00
Ying Wang
3c9d049084
am c38acbbe: Merge "Fix docs build." into klp-dev
...
* commit 'c38acbbe3060086977a1f9877b9d4befed5894be':
Fix docs build.
2013-09-14 12:03:58 -07:00
Ying Wang
930d4e52ad
Fix docs build.
...
Change-Id: I4a1608bfad809d67240db2070fda85df486179e6
2013-09-14 11:57:17 -07:00
Maggie Benthall
96b82aae35
am b964e5ed: am f5aba5ad: Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev
...
* commit 'b964e5edff92849c4ade7d43b86bfaca26d2a4a4':
CA cert monitoring: add notifications and actions for dialog
2013-09-14 11:04:08 -07:00
Maggie Benthall
b964e5edff
am f5aba5ad: Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev
...
* commit 'f5aba5ad1e09829a13bd0ad4912e45ff3d773176':
CA cert monitoring: add notifications and actions for dialog
2013-09-14 11:02:43 -07:00
Maggie Benthall
f5aba5ad1e
Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev
2013-09-14 18:00:13 +00:00
Michael Jurka
6f11e3254e
am 9d4d14fa: am 276e6c7a: Merge "Add new intent/method for cropping and setting wallpapers" into klp-dev
...
* commit '9d4d14fa292e4ef7beb66c20b0b2c139b81d3c8f':
Add new intent/method for cropping and setting wallpapers
2013-09-14 05:32:00 -07:00
Michael Jurka
9d4d14fa29
am 276e6c7a: Merge "Add new intent/method for cropping and setting wallpapers" into klp-dev
...
* commit '276e6c7a89ed91dbf3e4fe9f46d19e82656d8fd9':
Add new intent/method for cropping and setting wallpapers
2013-09-14 05:29:39 -07:00
Michael Jurka
276e6c7a89
Merge "Add new intent/method for cropping and setting wallpapers" into klp-dev
2013-09-14 12:25:51 +00:00
Svetoslav Ganov
860f8a6b66
Spooler should not crash if print service config activities are not exported.
...
1. If a print service does not export its activities for settings and
adding printers the print spooler ignores them instead of crashing.
Also if the service is not enabled its activities are now ignored.
2. Added a dedicated permission for a print service to optionally
protect its settings and add printer activities such that only the
system can bind to them.
3. Fixed a crash in the print dialog if its content is detached
from the window and animators are running.
bug:10680224
Change-Id: I20b57d6622a15f9b2352ba78d04c44e67b316a15
2013-09-14 01:00:55 -07:00
Chet Haase
69d9cd7c37
am 140f3dff: am 750ce3ac: Merge "Only buildLayer() on attached views" into klp-dev
...
* commit '140f3dff592a93cf5ace2c3a2830c56933b5bc54':
Only buildLayer() on attached views
2013-09-13 20:44:21 -07:00
Chet Haase
140f3dff59
am 750ce3ac: Merge "Only buildLayer() on attached views" into klp-dev
...
* commit '750ce3acf23e5c2e5b239154a2539391544f9463':
Only buildLayer() on attached views
2013-09-13 20:42:25 -07:00
Chet Haase
750ce3acf2
Merge "Only buildLayer() on attached views" into klp-dev
2013-09-14 03:39:45 +00:00
Matthew Williams
8ef2204c8f
Refactor SyncManager rename authority->target
...
fix bug that was stopping any sync service sync from
from taking place.
Change-Id: Ib3f46d43be630d4196fbf0ca32da03b6e7a6a5b9
2013-09-13 19:22:50 -07:00
Geoff Mendal
84443425e2
am 6689c674: am c028d8f0: Merge "Disable ActionBar transitions" into klp-dev
...
* commit '6689c674d9eb7aa62596b362f87e2d06e10d44ef':
Disable ActionBar transitions
2013-09-13 19:11:52 -07:00
Geoff Mendal
6689c674d9
am c028d8f0: Merge "Disable ActionBar transitions" into klp-dev
...
* commit 'c028d8f05c0cf32489bd369ce5612ce6a4077e7a':
Disable ActionBar transitions
2013-09-13 19:09:47 -07:00
Geoff Mendal
c028d8f05c
Merge "Disable ActionBar transitions" into klp-dev
2013-09-14 02:08:20 +00:00
Chet Haase
5fd37236df
Only buildLayer() on attached views
...
A recent change to ViewPropertyAnimator.withLayer() builds the layer
immediately after creating it. This works in general, but if the view
is not attached, buildLayer() throws an exception.
The fix is to ensure that the view is attached before calling buildLayer().
Issue #10750925 Dialer crashed and phone dropped while on call
Change-Id: I801c835a0f5cb81e159fe90c157c122cf2d0da01
2013-09-13 19:01:52 -07:00
Chet Haase
7d077d0364
Disable ActionBar transitions
...
A problem with transitions is causing various ActionBar icons to go
missing occasionally. This CL disables these transitions for now
to allow ActionBar to work as expected.
Issue #10726905 ActionBar weirdness in People app
Change-Id: I0cb774840ae84cbb733d65865f8c1b4c6d7490fa
2013-09-13 18:51:12 -07:00
Alan Viverette
d17e719da0
Merge "Clean up layout constructors, make them consistent"
2013-09-14 01:22:45 +00:00
Scott Main
26c5baf41d
am 7e876482: am 296fbce8: am bb3b431d: am 8bf0c9ae: am a23fd887: more javadocs for onTrimMemory()
...
* commit '7e87648232e955629375c6ae047b9c2faceaa67e':
more javadocs for onTrimMemory()
2013-09-13 18:17:10 -07:00
Scott Main
7e87648232
am 296fbce8: am bb3b431d: am 8bf0c9ae: am a23fd887: more javadocs for onTrimMemory()
...
* commit '296fbce89c066099bbf4f3828cf8ed797acebdfb':
more javadocs for onTrimMemory()
2013-09-13 18:13:51 -07:00
Dianne Hackborn
3f7867b603
am 570d0ca3: am fc9122ec: Merge "Implement #10666712 : NetworkOnMainThreadException should be..." into klp-dev
...
* commit '570d0ca39cd8d11faf7cc453cfd8096e07c3877b':
Implement #10666712 : NetworkOnMainThreadException should be...
2013-09-13 18:10:19 -07:00
David Christie
6180e84410
am 691a3191: am 5f68f717: Merge "Strip names out of externally supplied WorkSources to WifiManager (b/10710007)." into klp-dev
...
* commit '691a3191e3efb11f0607c45f29e460d2baf8188e':
Strip names out of externally supplied WorkSources to WifiManager (b/10710007).
2013-09-13 18:10:16 -07:00
Scott Main
296fbce89c
am bb3b431d: am 8bf0c9ae: am a23fd887: more javadocs for onTrimMemory()
...
* commit 'bb3b431dc6b5786bed7cc988f44c35df21408a93':
more javadocs for onTrimMemory()
2013-09-13 18:09:45 -07:00
Dianne Hackborn
570d0ca39c
am fc9122ec: Merge "Implement #10666712 : NetworkOnMainThreadException should be..." into klp-dev
...
* commit 'fc9122ecae06339283602bdc78c5d704d95e3f29':
Implement #10666712 : NetworkOnMainThreadException should be...
2013-09-13 18:06:59 -07:00
David Christie
691a3191e3
am 5f68f717: Merge "Strip names out of externally supplied WorkSources to WifiManager (b/10710007)." into klp-dev
...
* commit '5f68f717019433ce4fa284386ba48bd1b571073a':
Strip names out of externally supplied WorkSources to WifiManager (b/10710007).
2013-09-13 18:06:56 -07:00
Scott Main
bb3b431dc6
am 8bf0c9ae: am a23fd887: more javadocs for onTrimMemory()
...
* commit '8bf0c9ae604e5114260159077bfafbdd9d16a7ea':
more javadocs for onTrimMemory()
2013-09-13 18:06:28 -07:00
Dianne Hackborn
fc9122ecae
Merge "Implement #10666712 : NetworkOnMainThreadException should be..." into klp-dev
2013-09-14 01:04:05 +00:00
Scott Main
8bf0c9ae60
am a23fd887: more javadocs for onTrimMemory()
...
* commit 'a23fd88729bd10c02a9d631c9954616b3a1d0f6f':
more javadocs for onTrimMemory()
2013-09-13 18:03:18 -07:00
David Christie
5f68f71701
Merge "Strip names out of externally supplied WorkSources to WifiManager (b/10710007)." into klp-dev
2013-09-14 01:02:40 +00:00
Scott Main
a23fd88729
more javadocs for onTrimMemory()
...
Change-Id: I52a99bc1b07732e474d1c632f3021c6c4db8c5ab
2013-09-13 17:57:16 -07:00
David Christie
6ab2284c98
Strip names out of externally supplied WorkSources to WifiManager (b/10710007).
...
Change-Id: I69bd7ce9e942c2f9327415b2821d805e1b50a1a4
2013-09-13 17:34:40 -07:00
Dianne Hackborn
7e7144218e
Implement #10666712 : NetworkOnMainThreadException should be...
...
...relayed back to calling application
What's one more exception between friends?
Change-Id: Ib83c7bfbddd397457dcdbe506a8cd2bc0f4fb70b
2013-09-13 17:32:57 -07:00
Adam Powell
3934b9f520
am db34f3d1: am 50e5814c: Merge "Check RelativeLayout\'s access of its own LayoutParams during measurement" into klp-dev
...
* commit 'db34f3d17d0d2b6eaad8369536dcbb1025d0a00c':
Check RelativeLayout's access of its own LayoutParams during measurement
2013-09-13 17:32:21 -07:00