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

19635 Commits

Author SHA1 Message Date
Adam Powell
d650b51139 Asset updates for dialog frames and seek bar thumbs 
Change-Id: I3214fe9a2f1e2404d29f0a2ea22ac2fdf4ddbf31
 2011-02-03 16:47:11 -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
Amith Yamasani
823fbbbab5 Merge "Expanded volume panel with sliders and mute buttons." into honeycomb 2011-02-03 16:11:32 -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
Justin Ho
0c3169cf20 am 60a008ed: Updated volume dialog assets 
* commit '60a008ed834da2b9eb6968cfb05733860aaa51b5':
  Updated volume dialog assets
 2011-02-03 15:34:04 -08:00
Nick Pelly
630ac8df24 Merge "NFC documentation overhaul." into gingerbread 2011-02-03 15:23:17 -08:00
Lorenzo Colitti
8e63c3e33b Add a protocol property to the APNs and use it. 
1. Database changes:
   - Add a protocol and a roaming_protocol column to the
     carriers table in the telephony provider database.
   - Set the protocol and roaming_protocol fields when
     creating APN objects from the database.

2. ApnSetting class changes:
   - Add protocol and roamingProtocol fields to the
     ApnSetting class that encapsulates APN settings within
     the framework.
   - Add the fields to ApnSetting.toString and support a new
     syntax containing the fields in ApnSetting.fromString.
   - Add a unit test for ApnSetting.

3. Telephony changes:
   - Specify the APN protocol when setting up a data call,
     using protocol when not roaming and roaming_protocol
     when roaming.

This change depends on #94983 in the telephony provider,
which adds the new column to the database schema on
upgrades.

Change-Id: Ic4e3f02e48f17990f657187b9919d265671f0138
 2011-02-03 15:19:13 -08:00
Nick Pelly
74fe6c6b24 NFC documentation overhaul. 
Change-Id: I45dca95a24b2d0327e080436fbcc7b1dad79de02
 2011-02-03 15:11:09 -08:00
Justin Ho
60a008ed83 Updated volume dialog assets 
Change-Id: I520cb3286d29241ccd846f29f682b6582f5abce1
 2011-02-03 14:47:42 -08:00
Justin Ho
fc05bc3b36 am cc84ea17: Merge "Updated default wallpaper" into honeycomb 
* commit 'cc84ea17680e566f79fdfc1f3c1d7169c37dd1c2':
  Updated default wallpaper
 2011-02-03 14:16:40 -08:00
Justin Ho
cc84ea1768 Merge "Updated default wallpaper" into honeycomb 2011-02-03 14:13:08 -08:00
Justin Ho
39f377e9fc Updated default wallpaper 
Change-Id: Ic0312b9216fe40232ec237591fc0a5506c5a5d6c
 2011-02-03 14:11:40 -08:00
Justin Ho
efba660d8e am 97e1dbab: Merge "Adding remaining volume dialog assets" into honeycomb 
* commit '97e1dbab57b6804661afd37747f73c1258133916':
  Adding remaining volume dialog assets
 2011-02-03 13:52:54 -08:00
Justin Ho
97e1dbab57 Merge "Adding remaining volume dialog assets" into honeycomb 2011-02-03 13:50:09 -08:00
Justin Ho
8bdfcaa0c4 am 9b95d352: Updated Talk notification icon Bug: 3362749 
* commit '9b95d3522103671554cca018488b6bd8b7982f38':
  Updated Talk notification icon Bug: 3362749
 2011-02-03 13:45:36 -08:00
Justin Ho
9b95d35221 Updated Talk notification icon 
Bug: 3362749

Change-Id: I4896a283ba4a552ee23cd69c76a397c31cddfb8d
 2011-02-03 13:41:15 -08:00
Justin Ho
f451a46cc2 Adding remaining volume dialog assets 
Change-Id: If3e58507dd0af454a3dbcdb4cb826c60503d72cc
 2011-02-03 13:40:04 -08:00
Jean-Baptiste Queru
4b8ad9effd Merge from gingerbread 
Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c
 2011-02-03 13:17:49 -08:00
Robert Greenwalt
f8d40f0d55 Merge "Bind addr and prefixLength together in LinkAddress" 2011-02-03 13:17:48 -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
Marco Nelissen
770d02c2fa Unhide MediaStore.getVersion so Music2 can use it. 
Change-Id: I006860fe2bd828ffdc598dc89329eba952fde5b3
 2011-02-03 12:23:40 -08:00
Vasu Nori
e1cbd0a85f Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb" 
This reverts commit 6bc710f769618e87b98d51cd02241e6b1a2fb653, reversing
changes made to 7ba35f5ab3c838c7f1b3ab957be685ac1f506b2a.
 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
Michael Jurka
8275c60878 Merge "adding fast setters for translationx/y" into honeycomb 2011-02-03 12:00:37 -08:00
Romain Guy
cb2c84fd81 am 3b66e43e: Merge "Refresh display lists when turning off layers rendering. Bug #3420565" into honeycomb 
* commit '3b66e43e8c5671c646ccc6d52b0f2dec13898c91':
  Refresh display lists when turning off layers rendering. Bug #3420565
 2011-02-03 11:46:47 -08:00
Shimeng (Simon) Wang
4eb02a13b3 Merge "Use more accurate height/width ratio." 2011-02-03 11:44:06 -08:00
Romain Guy
3b66e43e8c Merge "Refresh display lists when turning off layers rendering. Bug #3420565" into honeycomb 2011-02-03 11:43:17 -08:00
Romain Guy
9d18f2d189 Refresh display lists when turning off layers rendering. 
Bug #3420565

Change-Id: I2139540e591a97cd487e3d7cce6b70d6b23df9de
 2011-02-03 11:32:38 -08:00
Marco Nelissen
3822f73a58 Add a convenience method for getting the media provider version. 
b/3350571

Change-Id: I1280a49029aa75643397fab7113b4dd80b639809
 2011-02-03 10:59:30 -08:00
Eric Laurent
6f1bd261b7 am 9c0a1003: Merge "Fix issue 3371080" into honeycomb 
* commit '9c0a1003bd676121cf9b1c942ecebd5b486290d5':
  Fix issue 3371080
 2011-02-03 10:28:24 -08:00
Eric Laurent
9c0a1003bd Merge "Fix issue 3371080" into honeycomb 2011-02-03 10:26:05 -08:00
Shimeng (Simon) Wang
a0cc8642cc Use more accurate height/width ratio. 
When calculating the view height, use more accurate height/width
ratio, instead of the second hand ratio after height and width
are calculated and rounded.

This prevents the height value to be fluctuated by 1 sometimes
when zooming.

issue: 3385757
Change-Id: I08bf5478ae8b8fd799df892e19f450cb558d8b7f
 2011-02-03 10:24:03 -08:00
Mike Lockwood
04f024d564 Merge changes I80558c62,I6587f580 
* changes:
  UsbService: Blacklist HID boot subclass devices (keyboards and mice)
  UsbService: Add support for blacklisting certain USB busses
 2011-02-03 09:51:06 -08:00
Eric Laurent
25101b0b9a Fix issue 3371080 
Modified default volume control logic in AudioService:
1 IN_CALL volume if in video/audio chat
2 NOTIFICATION if notification is playing or was playing less than 5s ago.
3 MUSIC

Modified silent mode:
- now also affect MUSIC stream type
- entering silent mode when VOL- hard key is pressed once while selected
stream volume is already at 0 (except for VOICE_CALL stream).
- exiting silent mode when pressing VOL+ hard key while in silent mode

Play sound FX (audible selections, keyboard clicks) at a fixed volume.

Modified audio framework:
- isStreamActive() method now implemented in AudioPolicyManagerBase (previously AudioFlinger)
- iStreamActive() now specifies a time window during which the stream is considered
active after it actually stopped.

Change-Id: I7e5a0724099450b9fc90825224180ac97322785f
 2011-02-03 09:26:24 -08:00
Cary Clark
859563ebf7 am aa7dc928: Merge "stop GL drawing thread before killing WebCore" into honeycomb 
* commit 'aa7dc92838f4e3d423b2a738f54de9b83f83794b':
  stop GL drawing thread before killing WebCore
 2011-02-03 08:52:21 -08:00
Cary Clark
aa7dc92838 Merge "stop GL drawing thread before killing WebCore" into honeycomb 2011-02-03 08:48:24 -08:00
Justin Ho
7d75cd65fa am b732e6d2: Merge "Changing Honeycomb default wallpaper" into honeycomb 
* commit 'b732e6d20571e9098b02f4d49f0e4359c232eaa0':
  Changing Honeycomb default wallpaper
 2011-02-03 07:31:28 -08:00
Justin Ho
b732e6d205 Merge "Changing Honeycomb default wallpaper" into honeycomb 2011-02-03 07:25:18 -08:00
Justin Ho
6baf391cac Changing Honeycomb default wallpaper 
Change-Id: I5f3b0d8608d1712c3c96d1f9882706fd08c12588
 2011-02-03 07:23:43 -08:00
Cary Clark
d9fd857ca9 stop GL drawing thread before killing WebCore 
The TexturesGenerator thread references pictures owned by the
WebCore thread, so must be stopped before the WebCore thread
is deleted.

Requires a companion change in external/webkit

bug:3406185
Change-Id: I5b2f8b3b52367b05301c76e5bd22a95fcd0338d5
 2011-02-03 05:37:04 -05:00