Jeff Hamilton
510ced64f4
am 1ac35411: am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
...
* commit '1ac35411f186dca346e8d9078a4fd2d570bb8a97':
Improve the docs a bit for foreground dispatch.
2011-02-10 13:52:23 -08:00
Jeff Hamilton
1ac35411f1
am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
...
* commit '584afa8dde1777b181e773a491416769f25607a8':
Improve the docs a bit for foreground dispatch.
2011-02-08 19:33:53 -08:00
Jeff Hamilton
167d9e473f
Improve the docs a bit for foreground dispatch.
...
Change-Id: I4179133a0956bc66a49201c20f1dd2d6d67874d2
2011-02-09 12:30:18 +09:00
Gilles Debunne
63bd55c7bf
am cdfe8999: Fix for multiple merge problem.
...
* commit 'cdfe899991c365d9e197d83f8859089cae082011':
Fix for multiple merge problem.
2011-02-08 17:31:33 -08:00
Gilles Debunne
e04c14962f
resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp
...
Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
2011-02-08 16:33:58 -08:00
Scott Main
3c5653773d
am b508d6e2: Merge "docs: fix links to revised fundamentals documents" into honeycomb
...
* commit 'b508d6e26e3a1fd68bf637dc29df335f0e7ccd92':
docs: fix links to revised fundamentals documents
2011-02-08 14:57:45 -08:00
Scott Main
7aee61f5a9
docs: fix links to revised fundamentals documents
...
Change-Id: Ie2a660cce1d00f924c9fde5c6a00776307e5e1c7
2011-02-08 11:37:44 -08:00
Scott Main
602a891aea
am b0f1cfff: Merge "docs: SearchView is iconified by default" into honeycomb
...
* commit 'b0f1cfffd9b201335560c15ffbdcfe12225bac8c':
docs: SearchView is iconified by default
2011-02-07 09:44:52 -08:00
Scott Main
b0f1cfffd9
Merge "docs: SearchView is iconified by default" into honeycomb
2011-02-07 09:33:32 -08:00
Scott Main
cccdbe9acb
docs: SearchView is iconified by default
...
Change-Id: Iabe0fdc0b28847f0c401e3692932a73b7d595c88
2011-02-06 16:28:05 -08:00
Paul Eastham
9a5bda875f
am be46d145: Revert "Fix for StaticLayout bug with ellipsized text"
...
* commit 'be46d1456beb7e2f3e8b82bda2d0a5023db3debd':
Revert "Fix for StaticLayout bug with ellipsized text"
2011-02-04 19:23:10 -08:00
Paul Eastham
be46d1456b
Revert "Fix for StaticLayout bug with ellipsized text"
...
This reverts commit bbc910f229dec45fa7481a62fbf051f7ff3130e7.
2011-02-04 19:17:54 -08:00
Gilles Debunne
cdfe899991
Fix for multiple merge problem.
...
Change-Id: I5d9c497f44aa9cdc34c195c41e02c3d7353c3fb4
2011-02-04 16:50:01 -08:00
Kenny Root
6465889ecb
am c4dfa998: am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
...
* commit 'c4dfa998b7660b9afc4d41b0c940d798f2122fc3':
JPtextinput: Dont break emoji characters when cutting strings.
2011-02-04 16:16:19 -08:00
Kenny Root
c4dfa998b7
am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
...
* commit 'd2a996173e53e7b38ff9b703cc5986d9715508a1':
JPtextinput: Dont break emoji characters when cutting strings.
2011-02-04 16:12:14 -08:00
Kenny Root
d2a996173e
am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
...
* commit 'c94a99987d8a49ea599c22ffad0e61db591963e0':
JPtextinput: Dont break emoji characters when cutting strings.
2011-02-04 16:01:13 -08:00
Gilles Debunne
1ba2a47b82
am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread
...
* commit '893ac28f75561061a8f334cbd4e47833d7fd7843':
Blinking runnable is created only if text is editable. DO NOT MERGE.
2011-02-04 15:50:15 -08:00
Gilles Debunne
826fbdf7b6
am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
...
* commit '8a6ba494a28702e68b0a8fbd8bac34335536a8f8':
All runnable are stopped on detach. DO NOT MERGE.
2011-02-04 15:50:12 -08:00
Gilles Debunne
c0728cc042
Double tap triggers text selection in a TextView. DO NOT MERGE
...
This is a convenient way to switch to selection mode without the
context menu. Context menu is still available and offerts Select Input method option.
Browser overloads touch events and this feature is not available in Browser which
limits the conflict with double tap zoom in browser.
Change-Id: I286504cf03733d5c2fb9bc01765f713d14bbd2f4
2011-02-04 15:50:10 -08:00
Gilles Debunne
2f7e9d403a
am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
...
* commit '53841df2a49bffa53ba3d1e4b0580f4f23a64dc3':
SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
2011-02-04 15:49:56 -08:00
Gilles Debunne
893ac28f75
Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread
2011-02-04 15:46:15 -08:00
Gilles Debunne
8a6ba494a2
Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
2011-02-04 15:46:11 -08:00
Gilles Debunne
53841df2a4
Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
2011-02-04 15:46:06 -08:00
Kenny Root
c94a99987d
Merge "JPtextinput: Dont break emoji characters when cutting strings."
2011-02-04 15:42:14 -08:00
Eric Laurent
bdb23c2675
am 2e96f15d: Merge "Fix issues 3425035 and 3423785." into honeycomb
...
* commit '2e96f15d8c6608c6bcb49c73fe13078a57245b28':
Fix issues 3425035 and 3423785.
2011-02-04 14:08:25 -08:00
Eric Laurent
2e96f15d8c
Merge "Fix issues 3425035 and 3423785." into honeycomb
2011-02-04 14:06:40 -08:00
Gilles Debunne
63308bd092
am a324a581: Merge "Fix for StaticLayout bug with ellipsized text" into honeycomb
...
* commit 'a324a5810c84596d3a4f67f81a725a0c98dfc30f':
Fix for StaticLayout bug with ellipsized text
2011-02-04 14:02:05 -08:00
Gilles Debunne
a324a5810c
Merge "Fix for StaticLayout bug with ellipsized text" into honeycomb
2011-02-04 13:59:29 -08:00
Eric Laurent
402f7f2963
Fix issues 3425035 and 3423785.
...
- Make sure that STREAM_MUSIC is affected by ringer mode on non voice capable
devices whatever the saved settings say.
- Added a hidden method to AudioManager for VolumePanel to override
the stream selection logic while the panel is showing.
Change-Id: Ib2ff2a7af63decb4e29c45700c41e5058f79d877
2011-02-04 12:39:14 -08:00
Mike Cleron
c146790893
am b8578741: Merge "Fix issue #3424823 : 4-corner trick causes runtime restart" into honeycomb
...
* commit 'b85787411085bbea0ac725135cae02a4167b7aa7':
Fix issue #3424823 : 4-corner trick causes runtime restart
2011-02-04 11:56:23 -08:00
Mike Cleron
b857874110
Merge "Fix issue #3424823 : 4-corner trick causes runtime restart" into honeycomb
2011-02-04 11:53:58 -08:00
Patrick Scott
01b7a98c31
am 160c18a4: Merge "Need a public way to wait for cookie operations." into honeycomb
...
* commit '160c18a4d209f56766fdd90e4711c8e29fd407e6':
Need a public way to wait for cookie operations.
2011-02-04 11:22:41 -08:00
Dianne Hackborn
912d9d1369
Fix issue #3424823 : 4-corner trick causes runtime restart
...
Change-Id: Ibd3fc63d0ab975a2b74765a00023c7f783b24216
2011-02-04 10:35:36 -08:00
Patrick Scott
b88e52c760
Need a public way to wait for cookie operations.
...
Hidden for now as we are past the public api deadline.
Bug: 3421214
Change-Id: I8a65ae479d0b8b020af2600d7d29d5d358414add
2011-02-04 12:52:46 -05:00
Mike Cleron
9cfa9c7a3f
am f6141980: Merge changes I46acd27a,I70b322e1 into honeycomb
...
* commit 'f6141980c84f64618f083297bc37cfae7e0fca84':
aa is better than cc
Prevent ProgressBar from slowing down everything. bug #3422568
2011-02-03 21:19:33 -08:00
Mike Cleron
f6141980c8
Merge changes I46acd27a,I70b322e1 into honeycomb
...
* changes:
aa is better than cc
Prevent ProgressBar from slowing down everything. bug #3422568
2011-02-03 21:17:09 -08:00
Daniel Sandler
31796297d4
am 4ad2547f: Merge "Ongoing notification for GPS use." into honeycomb
...
* commit '4ad2547fe08bab430d7d9f9cc4b789410856c9c3':
Ongoing notification for GPS use.
2011-02-03 20:51:00 -08:00
Daniel Sandler
4ad2547fe0
Merge "Ongoing notification for GPS use." into honeycomb
2011-02-03 20:49:10 -08:00
Eric Laurent
a37a81d705
am e6955f8e: Merge "Issue 3371080: fix VolumePanel in mute state" into honeycomb
...
* commit 'e6955f8e38dfe7c0d748c3b55bbcfc5640c968c5':
Issue 3371080: fix VolumePanel in mute state
2011-02-03 19:38:27 -08:00
Eric Laurent
e6955f8e38
Merge "Issue 3371080: fix VolumePanel in mute state" into honeycomb
2011-02-03 19:35:57 -08:00
Eric Laurent
d72d51c77a
Issue 3371080: fix VolumePanel in mute state
...
VolumePanel must take stream mute state into account before displaying
the update stream volume.
Change-Id: I03a1697c25fca3fa56f892e3d426d00906abeb79
2011-02-03 18:47:47 -08:00
Jim Miller
6b590c8fd3
am 0d47ac11: Merge "Fix 3419077: Allow subclasses to change SeekBarPreference action buttons." into honeycomb
...
* commit '0d47ac11764b89431777c3a84efd5fa9c17130dc':
Fix 3419077: Allow subclasses to change SeekBarPreference action buttons.
2011-02-03 18:42:08 -08:00
Jim Miller
0d47ac1176
Merge "Fix 3419077: Allow subclasses to change SeekBarPreference action buttons." into honeycomb
2011-02-03 18:39:39 -08:00
Jim Miller
da983f734c
am 4ce0cad1: Merge "Issue 3371080: fix volume update in mute state." into honeycomb
...
* commit '4ce0cad1b31016970f65bae0151dccb2234ee202':
Issue 3371080: fix volume update in mute state.
2011-02-03 18:32:32 -08:00
Jim Miller
4ce0cad1b3
Merge "Issue 3371080: fix volume update in mute state." into honeycomb
2011-02-03 18:29:36 -08:00
Daniel Sandler
e40451a89d
Ongoing notification for GPS use.
...
This change improves upon the notification priority API
introduced in change I9e738cc4, allowing privileged clients
to set the priority of a notification when posting it
directly to INotificationManager. StatusBarTest is updated
to test this new feature.
The new LocationController in SystemUI uses this facility to
post a high-priority ongoing notification whenever GPS is in
use (replacing the functionality of the legacy GPS status
bar icon).
Also happens to fix http://b/3325472 (adding a log message
when notifications are dropped because of a missing icon).
Bug: 3412807
Change-Id: I523016ffa53bf979be98ddc4a2deb55a6270c68a
2011-02-03 21:11:46 -05:00
Romain Guy
2f57ba56b3
Prevent ProgressBar from slowing down everything.
...
bug #3422568
Change-Id: I70b322e140a8fdbe504c6984c54a22bcb7b753e7
2011-02-03 18:03:29 -08:00
Dianne Hackborn
94baff4797
am 1b1962f3: Merge "Fix issue #3420898 : More wallpaper issues" into honeycomb
...
* commit '1b1962f38304d2cbf12ac008791d93d3f1bdf0a6':
Fix issue #3420898 : More wallpaper issues
2011-02-03 17:50:51 -08:00
Gilles Debunne
bbc910f229
Fix for StaticLayout bug with ellipsized text
...
This fixes the test, but I believe this class still needs a lot of fixing.
Change-Id: Ib6386196908ea8432b175d6994f9299778a322d2
2011-02-03 17:42:18 -08:00
Eric Laurent
0f31fe0968
Issue 3371080: fix volume update in mute state.
...
VolumePreference should take the stream mute state into account
when updating the progress bar if a change is received by
the content observer
Change-Id: Ia1a8af9d4cc349d2d57753d865e8d2e58daf04f1
2011-02-03 17:34:39 -08:00