Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,589 Commits 3 Branches 0 Tags
a5c8eb76f5f7bfbc5d53f2cd2c6f0a23a2fe8712
Commit Graph

14684 Commits

Author SHA1 Message Date
Paul Eastham
19e70cbbcb am 9a5bda87: am be46d145: Revert "Fix for StaticLayout bug with ellipsized text" 
* commit '9a5bda875f86b188b501ce7cf73810dd92288251':
  Revert "Fix for StaticLayout bug with ellipsized text"
 2011-02-07 13:50:42 -08:00
Kenny Root
7679365b54 am 6465889e: am c4dfa998: am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings." 
* commit '6465889ecbf4c04bb4bb6f4e8d4306727f7ca837':
  JPtextinput: Dont break emoji characters when cutting strings.
 2011-02-07 13:49:08 -08:00
Eric Laurent
3da2538aa1 am bdb23c26: am 2e96f15d: Merge "Fix issues 3425035 and 3423785." into honeycomb 
* commit 'bdb23c26759089e29eb2f379e296bd006bc32b97':
  Fix issues 3425035 and 3423785.
 2011-02-07 13:46:31 -08:00
Gilles Debunne
de1285e7ea am 63308bd0: am a324a581: Merge "Fix for StaticLayout bug with ellipsized text" into honeycomb 
* commit '63308bd092a0edcea685d9f81b3d6d6d345c663b':
  Fix for StaticLayout bug with ellipsized text
 2011-02-07 13:46:21 -08:00
Patrick Scott
f01e3b5b8f am 01b7a98c: am 160c18a4: Merge "Need a public way to wait for cookie operations." into honeycomb 
* commit '01b7a98c31f3d4587fb6739c8c6b35530177c20c':
  Need a public way to wait for cookie operations.
 2011-02-07 13:44:41 -08:00
Mike Cleron
85cabc2eb3 am 9cfa9c7a: am f6141980: Merge changes I46acd27a,I70b322e1 into honeycomb 
* commit '9cfa9c7a3f5f23dec6ef4575407c1076d1b3c479':
  aa is better than cc
  Prevent ProgressBar from slowing down everything. bug #3422568
 2011-02-07 13:41:21 -08:00
Daniel Sandler
32cd1d5053 resolved conflicts for merge of 31796297 to master 
Change-Id: Ice632b3378f8f67c186245fdb63b022ade864ba1
 2011-02-07 16:12:16 -05:00
Alon Albert
f313e95821 Merge "Move handing of a "cancel" inside try-finally block" 2011-02-07 12:20:36 -08:00
Dianne Hackborn
40e7a989e7 Merge "Fix COMPONENT_ENABLED_STATE check (copy from HC)" 2011-02-07 12:11:12 -08:00
Eric Laurent
ced2c59678 am a37a81d7: am e6955f8e: Merge "Issue 3371080: fix VolumePanel in mute state" into honeycomb 
* commit 'a37a81d705bd9abaf1110fecd176a74d32ac2016':
  Issue 3371080: fix VolumePanel in mute state
 2011-02-07 11:40:51 -08:00
Jim Miller
f44ca4664f am 6b590c8f: am 0d47ac11: Merge "Fix 3419077: Allow subclasses to change SeekBarPreference action buttons." into honeycomb 
* commit '6b590c8fd36c20961e9f4ab36bfc03e82f5abf24':
  Fix 3419077: Allow subclasses to change SeekBarPreference action buttons.
 2011-02-07 11:40:38 -08:00
Jim Miller
6572cfe8dc am da983f73: am 4ce0cad1: Merge "Issue 3371080: fix volume update in mute state." into honeycomb 
* commit 'da983f734c608fde57ea4f213d8640490a2f3a84':
  Issue 3371080: fix volume update in mute state.
 2011-02-07 11:40:21 -08:00
Nick Pelly
996d493967 am 7c95a2c2: am 062443f2: am 40684946: Merge "Fix docs type that broke build." into gingerbread 
* commit '7c95a2c2471e1ae2308f8a00927e08f321bf8059':
  Fix docs type that broke build.
 2011-02-07 11:37:28 -08:00
Amith Yamasani
9edc5c056f am 9589ac6c: am 823fbbba: Merge "Expanded volume panel with sliders and mute buttons." into honeycomb 
* commit '9589ac6c3f63a632e078adcc8ef742412af2014c':
  Expanded volume panel with sliders and mute buttons.
 2011-02-07 11:36:32 -08:00
Nick Pelly
ca3a704acc am 3bb7b0c2: am 5394ef06: am 630ac8df: Merge "NFC documentation overhaul." into gingerbread 
* commit '3bb7b0c2b3d448a60b64eba37c998d1f7c7424e2':
  NFC documentation overhaul.
 2011-02-07 11:35:47 -08:00
Alon Albert
9257ec0563 Move handing of a "cancel" inside try-finally block 
Bug: 3417906
Change-Id: I87e41c0cdad74e2ba72a7b4d1f059e72d106e105
 2011-02-07 10:53:26 -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 bbc910f229.
 2011-02-04 19:17:54 -08:00
Lorenzo Colitti
24401c7966 Merge "Add a protocol property to the APNs and use it." 2011-02-04 17:41:11 -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
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
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
Robert Greenwalt
6d1f9d031d Merge "Place the DHCP server address in the "next server IP address" field of the bootp header. A certain Apple client likes this, and it is more consistent with other DHCP servers." 2011-02-04 10:16:22 -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
Leon Scroggins
2f7fa83507 Save form data when submitted. 
Bug:3280725

Save form data when submitted, rather than when a page
loads.

Requires a change in external/webkit.

Change-Id: I3ff9515ef9e9ab28992cdc8a7beb537752ed1e8c
 2011-02-04 11:43:19 -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