drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,086 Commits 1 Branch 0 Tags
Commit Graph

18850 Commits

Author SHA1 Message Date
Eric Fischer
c3e3cc3dee am ebcbde6a: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'ebcbde6a6e5a8da947a3f28eba7207256b891fdd':
  Import revised translations.  DO NOT MERGE
 2011-02-09 10:47:47 -08:00
Eric Fischer
b8a036307a Import revised translations. DO NOT MERGE 
Change-Id: I989585acd6f901a82e8db9b07257af5a5736989e
 2011-02-08 18:00:38 -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
b508d6e26e Merge "docs: fix links to revised fundamentals documents" into honeycomb 2011-02-08 13:34:51 -08:00
Scott Main
7aee61f5a9 docs: fix links to revised fundamentals documents 
Change-Id: Ie2a660cce1d00f924c9fde5c6a00776307e5e1c7
 2011-02-08 11:37:44 -08:00
Eric Fischer
1e09ca2a1f am c7bece13: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'c7bece13495949db1736263a7cf5cf67c6165c51':
  Import revised translations.  DO NOT MERGE
 2011-02-08 10:40:47 -08:00
Eric Fischer
7dd2196e8b Import revised translations. DO NOT MERGE 
Change-Id: Icb56518620be62481ed0d152f7eb9ab44d6f759d
 2011-02-07 17:19:23 -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
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
Mike Cleron
a626eb18ae am 2d47fd3c: Merge "Fix crash when Paths are GCd in hw accelerated apps" into honeycomb 
* commit '2d47fd3c3566e5fbe16bcee2ec4be87c6cdc2440':
  Fix crash when Paths are GCd in hw accelerated apps
 2011-02-04 15:32:04 -08:00
Mike Cleron
2d47fd3c35 Merge "Fix crash when Paths are GCd in hw accelerated apps" into honeycomb 2011-02-04 15:29:28 -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
Chet Haase
5a7e828842 Fix crash when Paths are GCd in hw accelerated apps 
A recent change to optimize path rendering didn't account for
the destruction of native objects by the VM finalizer. We may be
done with the Java level version before we're done with the native
structure that's used by the display list. For example, a drawing
method on a View that creates a temporary path to render into the
canvas will implicitly create a native structure that is put onto
the GL display list. That temporary path may go away, but the native
version should stick around as long as the display list does.

The fix is to refcount the original native version of the path
and only delete it when the refcoutn reaches zero (which means that
it is no longer needed by any display list). This is a similar mechanism
used for bitmaps and shaders.

Change-Id: I4de1047415066d425d1c689aa60827f97729b470
 2011-02-04 12:50:55 -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
Romain Guy
9732d9e6ea am 43703325: Merge "New default wallpaper" into honeycomb 
* commit '43703325d8a8b755b9891708006abe8700884538':
  New default wallpaper
 2011-02-03 23:08:26 -08:00
Romain Guy
43703325d8 Merge "New default wallpaper" into honeycomb 2011-02-03 23:04:50 -08:00
Romain Guy
43a1da0807 New default wallpaper 
Change-Id: Iddb593e0b1775725b1bfaa2c74fb2f53fb7a4561
 2011-02-03 22:36:03 -08: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