Dave Burke
bafc8dcf69
am 34bc73df: Merge "Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"" into jb-mr2-dev
...
* commit '34bc73dff1f0c8402da3fc9bd1f0175bddcaa842':
Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
2013-06-12 21:11:12 -07:00
Adam Powell
fc93d0c108
Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
...
This reverts commit ef2277ec58 .
This caused a regression for some apps relying on the old behavior.
Bug 9372495
2013-06-12 17:38:25 -07:00
John Spurlock
46ae41221f
am a9221987: Merge "Save Notification large icon to extras." into jb-mr2-dev
...
* commit 'a9221987c047a9a05da9cc4f3446a0d581494a85':
Save Notification large icon to extras.
2013-06-11 14:09:53 -07:00
John Spurlock
a9221987c0
Merge "Save Notification large icon to extras." into jb-mr2-dev
2013-06-10 20:11:19 +00:00
Romain Guy
7a6e129759
am 8d8fc469: Merge "Don\'t orphan footers with transient state Bug #8725945 " into jb-mr2-dev
...
* commit '8d8fc469952ffe3feb45e52388f2129f8dd5e40c':
Don't orphan footers with transient state Bug #8725945
2013-06-10 10:26:57 -07:00
John Spurlock
bf563368e1
Save Notification large icon to extras.
...
This piece of semantic info was defined, cleared properly on
lightenPayload, but never saved.
Change-Id: Ib2c5372a57d2a01617e401231c150260d22b05d6
2013-06-10 11:45:17 -04:00
Romain Guy
b7e0f7942b
Don't orphan footers with transient state
...
Bug #8725945
Selecting text in an EditText causes the View to have transient
state. This would in turn cause the View to be removed from its
ListView parent. When removed, the EditText would lose its
AttachInfo, causing all sorts of problems. Headers and footers
must not be removed, only detached. This is the part of the fix
in AbsListView.
Fixing AbsListView triggered a second bug: when a View is removed
from the Window manager, it would keep its parent assigned, thus
making it impossible to add it again to the window manager. When
a ViewRootImpl goes through doDie(), it must set its content view's
parent to null to properly cleanup.
Change-Id: I0489daa74f8f7fcf85526f0928f8925ec30d4f42
2013-06-07 15:36:49 -07:00
Adam Powell
87c79d64ab
am d3cb6bcf: am 8152c794: Merge "Fix incorrect fragment animation used for hiding fragments"
...
* commit 'd3cb6bcf0f63317d1078a2f897d4824ba91402a6':
Fix incorrect fragment animation used for hiding fragments
2013-06-07 11:52:36 -07:00
Adam Powell
d3cb6bcf0f
am 8152c794: Merge "Fix incorrect fragment animation used for hiding fragments"
...
* commit '8152c7940a10f11a9edb16ae1daeca8a6fe2e6bb':
Fix incorrect fragment animation used for hiding fragments
2013-06-07 11:49:32 -07:00
Adam Powell
2756293910
Fix incorrect fragment animation used for hiding fragments
...
Mirror of support lib patch
https://android-review.googlesource.com/#/c/60032/ into
frameworks/base.
Change-Id: I8d1cb2e217721336674b8e3e2ef8722a8d9baefd
2013-06-07 10:19:22 -07:00
Scott Main
ad47f8c2dc
am 00d17f7a: add attributes to accessibility service info
...
* commit '00d17f7aab54ef055d35da603dab5a7bae751876':
add attributes to accessibility service info
2013-06-07 09:44:18 -07:00
Scott Main
00d17f7aab
add attributes to accessibility service info
...
Change-Id: I3651544164f718003b8eb1235a7d723f1bcee5be
2013-06-06 18:37:59 -07:00
Elliott Hughes
340df6c4f7
am 4d33a8ab: am fa6d6256: Merge "change "next" to "done" in minute IME option under 24-hour format"
...
* commit '4d33a8aba33fa70e1e1a1c713e487a26a090bc25':
change "next" to "done" in minute IME option under 24-hour format
2013-06-05 16:26:04 -07:00
Elliott Hughes
4d33a8aba3
am fa6d6256: Merge "change "next" to "done" in minute IME option under 24-hour format"
...
* commit 'fa6d6256e9052a5f5155ac97364170f6518e37a4':
change "next" to "done" in minute IME option under 24-hour format
2013-06-05 16:23:34 -07:00
Elliott Hughes
fa6d6256e9
Merge "change "next" to "done" in minute IME option under 24-hour format"
2013-06-05 23:20:37 +00:00
Scott Main
63fcfd5a52
am 06543a45: small cleanup of trigger event javadoc
...
* commit '06543a4559b34abf91e34cb44438683e77e7db36':
small cleanup of trigger event javadoc
2013-06-05 14:41:51 -07:00
Scott Main
06543a4559
small cleanup of trigger event javadoc
...
Change-Id: Ib8a0fc0a7ddac6259cc1bb9e8701b0d570a101c6
2013-06-05 14:29:50 -07:00
Winson Chung
18748035bb
am 379517b0: Merge "Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)" into jb-mr2-dev
...
* commit '379517b0d4d47b45b52b40f09ba0eb1a039cb773':
Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)
2013-06-05 11:47:45 -07:00
Winson Chung
379517b0d4
Merge "Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)" into jb-mr2-dev
2013-06-05 18:45:41 +00:00
Jeff Sharkey
ffbbe94506
am d293d229: Merge "Create missing Uids when recording network stats." into jb-mr2-dev
...
* commit 'd293d229493a2d661ebb1776a0915297927a5ca6':
Create missing Uids when recording network stats.
2013-06-04 16:57:51 -07:00
Jeff Sharkey
d293d22949
Merge "Create missing Uids when recording network stats." into jb-mr2-dev
2013-06-04 23:55:37 +00:00
Winson Chung
eeb4ff4d13
Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)
...
Change-Id: I6cfb8e0c586fad7360a07f98e1280a954f62e5e1
2013-06-04 14:25:28 -07:00
Jeff Sharkey
51797ed706
Create missing Uids when recording network stats.
...
Bug: 5543387
Change-Id: I138c8d2f84e6fd737f2f6ef0945e75ca31256e3d
2013-06-04 14:09:31 -07:00
Joe Malin
36d0f946ad
am e9dff008: am 305cf97b: am 60776093: am 029099ff: am f4b21585: am 10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
...
* commit 'e9dff008adc7b6e565402ec61cd89fb3265a28bd':
DOC CHANGE: Clarify textIsSelectable in TextView
2013-06-04 10:20:15 -07:00
Joe Malin
e9dff008ad
am 305cf97b: am 60776093: am 029099ff: am f4b21585: am 10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
...
* commit '305cf97ba7b927f49d3f52952c36cb5102699cc5':
DOC CHANGE: Clarify textIsSelectable in TextView
2013-06-04 10:17:46 -07:00
Joe Malin
305cf97ba7
am 60776093: am 029099ff: am f4b21585: am 10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
...
* commit '60776093a5569817040e2f65a17893a381906564':
DOC CHANGE: Clarify textIsSelectable in TextView
2013-06-04 10:14:48 -07:00
Joe Malin
60776093a5
am 029099ff: am f4b21585: am 10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
...
* commit '029099ff56b92201e10b2047e1ced675c8e9f964':
DOC CHANGE: Clarify textIsSelectable in TextView
2013-06-04 10:12:09 -07:00
Joe Malin
10d96950c1
DOC CHANGE: Clarify textIsSelectable in TextView
...
Change-Id: Iddfdf7ed82ea3fa2a0160bda4a1e29ec8f815a2b
2013-06-04 09:34:54 -07:00
Joe Malin
8811154e93
am 423f8a8c: am 2618ac55: am a37bda7b: am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager
...
* commit '423f8a8c21ec4e702e72ffce27bb3b5481170bae':
B9257437: Typo in javadoc for AccountManager
2013-06-03 14:31:21 -07:00
Joe Malin
423f8a8c21
am 2618ac55: am a37bda7b: am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager
...
* commit '2618ac55a94a97e29abd9defa93dea30e067b4e4':
B9257437: Typo in javadoc for AccountManager
2013-06-03 14:27:50 -07:00
Joe Malin
2618ac55a9
am a37bda7b: am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager
...
* commit 'a37bda7b616452d0072b012cc7ae8fcae51e943f':
B9257437: Typo in javadoc for AccountManager
2013-06-03 14:23:08 -07:00
Joe Malin
a37bda7b61
am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager
...
* commit '468d82bb7150996c8b2b4228d0e8d031f74e304b':
B9257437: Typo in javadoc for AccountManager
2013-06-03 14:20:45 -07:00
Joe Malin
b6a35268cc
B9257437: Typo in javadoc for AccountManager
...
Change-Id: I5349c2a0ba7e831d205f2801daecc24fa9a5b5a6
2013-06-03 12:20:08 -07:00
John Spurlock
0f41c05ece
am 0c2c62b2: Merge "Fix awkward wording in AppWidgetManager docs." into jb-mr2-dev
...
* commit '0c2c62b29d191d41129e3dc5451f07ce0ef6985f':
Fix awkward wording in AppWidgetManager docs.
2013-06-03 08:52:56 -07:00
John Spurlock
84a369c33b
Fix awkward wording in AppWidgetManager docs.
...
Change-Id: Ia06221f75898ab53f97852880bf2a7ec49b4f489
2013-06-03 11:38:48 -04:00
Dirk Dougherty
0f70bcfce3
am 8ebfb8c9: am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
...
* commit '8ebfb8c9c34caa80cd0d2451d950170c1b522f2a':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
2013-06-01 08:35:13 -07:00
Dirk Dougherty
8ebfb8c9c3
am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
...
* commit 'fdc0c8618b4e51c322f747202ff94508124e7c9c':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
2013-06-01 08:32:11 -07:00
Dirk Dougherty
fdc0c8618b
am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
...
* commit 'b18c725442e498a6447de37c3b9428b09837eda9':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
2013-06-01 08:28:48 -07:00
Dirk Dougherty
b18c725442
am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
...
* commit 'a404a62951ad8a2d657a587feb12780e725296e3':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
2013-06-01 08:26:32 -07:00
Dirk Dougherty
4fad5c176a
Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
2013-05-31 21:08:45 +00:00
Jean Chalard
44baed2dc3
am af9e5e5f: Merge "Improve the documentation for InputConnection." into jb-mr2-dev
...
* commit 'af9e5e5f618448f77f74bb36e0adbe88cb2ae156':
Improve the documentation for InputConnection.
2013-05-30 19:47:41 -07:00
Jean Chalard
af9e5e5f61
Merge "Improve the documentation for InputConnection." into jb-mr2-dev
2013-05-31 02:44:08 +00:00
Jeff Brown
6474d8407c
am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev
...
* commit '636af7a1cb90bb2f422bc85356d30f5b4e9342e6':
Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
2013-05-30 18:00:08 -07:00
Jeff Brown
636af7a1cb
Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev
2013-05-31 00:54:41 +00:00
Jeff Brown
14507e257a
Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
...
Bug: 9210033
Change-Id: I973c03b3a37e12af72a27c46d7da7fb59a30b606
2013-05-30 14:44:18 -07:00
Svetoslav
5fecbf9d10
am ec586994: Merge "CalendarView header not updated on year change." into jb-mr2-dev
...
* commit 'ec58699413ebe4cc2a72a8aae3c420fb3d764457':
CalendarView header not updated on year change.
2013-05-30 12:50:15 -07:00
Svetoslav
ec58699413
Merge "CalendarView header not updated on year change." into jb-mr2-dev
2013-05-30 19:49:00 +00:00
Daniel Sandler
491c607582
am 054255c6: Merge "Unhide action to launch Daydream settings." into jb-mr2-dev
...
* commit '054255c6d282a4ab2a95e56859242a2512871296':
Unhide action to launch Daydream settings.
2013-05-30 12:36:59 -07:00
Daniel Sandler
054255c6d2
Merge "Unhide action to launch Daydream settings." into jb-mr2-dev
2013-05-30 19:33:07 +00:00
Matthew Xie
0fdb05a770
am b190890a: Merge "Update javadoc to give app write better guidence" into jb-mr2-dev
...
* commit 'b190890a94dc2f0bd11da09f59550f86197f010a':
Update javadoc to give app write better guidence
2013-05-30 11:50:02 -07:00