Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,979 Commits 3 Branches 0 Tags
73edcfe8f4678c4d5e91c8018e00a72ea325da71
Commit Graph

14127 Commits

Author SHA1 Message Date
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
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
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
Nick Pelly
7c95a2c247 am 062443f2: am 40684946: Merge "Fix docs type that broke build." into gingerbread 
* commit '062443f2956bb85ef84485a62e9b0496fded68ae':
  Fix docs type that broke build.
 2011-02-03 16:35:12 -08:00
Nick Pelly
062443f295 am 40684946: Merge "Fix docs type that broke build." into gingerbread 
* commit '40684946cb00080c1c7424885f49a809816dd26e':
  Fix docs type that broke build.
 2011-02-03 16:32:29 -08:00
Nick Pelly
40684946cb Merge "Fix docs type that broke build." into gingerbread 2011-02-03 16:27:51 -08:00
Nick Pelly
46797ac098 Fix docs type that broke build. 
Change-Id: I5b5a2fc5baf95ace74bf90ff2c750ba890054d64
 2011-02-03 16:23:58 -08:00
Jim Miller
4c8aafe300 Fix 3419077: Allow subclasses to change SeekBarPreference action buttons. 
Change-Id: I2c624c3693fe06d9d3db3c203c7d4fc7a80b79d9
 2011-02-03 16:17:41 -08:00
Amith Yamasani
9589ac6c3f am 823fbbba: Merge "Expanded volume panel with sliders and mute buttons." into honeycomb 
* commit '823fbbbab5856fa46f56c7acbdddaa50bf211d09':
  Expanded volume panel with sliders and mute buttons.
 2011-02-03 16:13:37 -08:00
Nick Pelly
3bb7b0c2b3 am 5394ef06: am 630ac8df: Merge "NFC documentation overhaul." into gingerbread 
* commit '5394ef0618460dde365942406a6e64229abec7d2':
  NFC documentation overhaul.
 2011-02-03 16:04:26 -08:00
Nick Pelly
5394ef0618 am 630ac8df: Merge "NFC documentation overhaul." into gingerbread 
* commit '630ac8df2478cd0d47a90b95fbb13b9de4ad58b1':
  NFC documentation overhaul.
 2011-02-03 15:55:53 -08:00
Amith Yamasani
2bbdd77ab2 Expanded volume panel with sliders and mute buttons. 
Bug: 3395734

Volume panel that can be expanded and can be used
to control different streams' volume and toggle
silent mode.

Shows the active stream's slider on top and the
remaining below. Touching outside dismisses the
dialog as well as a 3 second timeout.

Dialog fades out after timeout.

Change-Id: Ief258cc904bfd3d62f1291adba4a9cf442bcb006
 2011-02-03 15:49:12 -08:00
Nick Pelly
630ac8df24 Merge "NFC documentation overhaul." into gingerbread 2011-02-03 15:23:17 -08:00
Nick Pelly
74fe6c6b24 NFC documentation overhaul. 
Change-Id: I45dca95a24b2d0327e080436fbcc7b1dad79de02
 2011-02-03 15:11:09 -08:00
Jean-Baptiste Queru
4b8ad9effd Merge from gingerbread 
Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c
 2011-02-03 13:17:49 -08:00
Jean-Baptiste Queru
5086c45718 am baaaca1c: Merge ee4c17ee from gingerbread 
* commit 'baaaca1c6164eff17488a178859295a1d5be9171':
  Fix delivery report error with PENDING status in SMS
 2011-02-03 13:12:35 -08:00
Jean-Baptiste Queru
baaaca1c61 Merge ee4c17ee from gingerbread 
Change-Id: Ide109e517fb7610d60f31ba6aa99fe665b59d690
 2011-02-03 13:03:53 -08:00
Jean-Baptiste Queru
ee4c17eec3 Merge from open-source gingerbread 
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
 2011-02-03 12:41:51 -08:00
Vasu Nori
9ec496b484 am e1cbd0a8: Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb" 
* commit 'e1cbd0a85f09a54f8bf28545ac67455b7dcd2532':
  Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
 2011-02-03 12:24:59 -08:00
Vasu Nori
e1cbd0a85f Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb" 
This reverts commit 6bc710f769, reversing
changes made to 7ba35f5ab3.
 2011-02-03 12:20:31 -08:00
Michael Jurka
d51e0820b3 am 8275c608: Merge "adding fast setters for translationx/y" into honeycomb 
* commit '8275c6087897e8fd614681d1cd12db62e6b9fcd5':
  adding fast setters for translationx/y
 2011-02-03 12:02:37 -08:00