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

19509 Commits

Author SHA1 Message Date
Adam Powell
e7175e848b am 86ce6866: am c1be7ac9: Merge "Asset updates for dialog frames and seek bar thumbs" into honeycomb 
* commit '86ce68668c700bd4090d6ef74df3483ce9fea957':
  Asset updates for dialog frames and seek bar thumbs
 2011-02-07 11:38:25 -08:00
Justin Ho
b843c687a7 am 6d1fbba6: am 40523b1b: Merge "Updating default wallpaper" into honeycomb 
* commit '6d1fbba68608dfd8d91d14d67bc34255a14ee4ac':
  Updating default wallpaper
 2011-02-07 11:38:04 -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
Justin Ho
e44e28fa11 am 0c3169cf: am 60a008ed: Updated volume dialog assets 
* commit '0c3169cf208b253b1f3f41ca82796a464eeec464':
  Updated volume dialog assets
 2011-02-07 10:57:19 -08:00
Justin Ho
f04b353573 am fc05bc3b: am cc84ea17: Merge "Updated default wallpaper" into honeycomb 
* commit 'fc05bc3b36c665a0da2661d57a2c5a68245e6a68':
  Updated default wallpaper
 2011-02-07 10:48:07 -08:00
Justin Ho
6d9aa80ae9 am efba660d: am 97e1dbab: Merge "Adding remaining volume dialog assets" into honeycomb 
* commit 'efba660d8efb8ed2f8c31c4aeea81b32016ad601':
  Adding remaining volume dialog assets
 2011-02-07 10:47:17 -08:00
Justin Ho
4a01756c99 am 8bdfcaa0: am 9b95d352: Updated Talk notification icon Bug: 3362749 
* commit '8bdfcaa0c452dba14b1dc03d9a78728bb39e72a0':
  Updated Talk notification icon Bug: 3362749
 2011-02-07 10:46:47 -08:00
Lorenzo Colitti
24401c7966 Merge "Add a protocol property to the APNs and use it." 2011-02-04 17:41:11 -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
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
Jean-Baptiste Queru
1372f0449b am 5086c457: am baaaca1c: Merge ee4c17ee from gingerbread 
* commit '5086c45718a8344fb36adf5b15e98953612cac37':
  Fix delivery report error with PENDING status in SMS
 2011-02-03 18:09:26 -08:00
Vasu Nori
1b67231483 am 9ec496b4: am e1cbd0a8: Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb" 
* commit '9ec496b484305defa6cbb691b85836ace8b73a02':
  Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
 2011-02-03 18:08:44 -08:00
Michael Jurka
bb01f8a2d0 am d51e0820: am 8275c608: Merge "adding fast setters for translationx/y" into honeycomb 
* commit 'd51e0820b3b7a71f2b3e0447bdf05188588c6003':
  adding fast setters for translationx/y
 2011-02-03 18:08:17 -08:00
Romain Guy
8b113cf6d7 am cb2c84fd: am 3b66e43e: Merge "Refresh display lists when turning off layers rendering. Bug #3420565" into honeycomb 
* commit 'cb2c84fd81a0891071e8ed0237927ad785751850':
  Refresh display lists when turning off layers rendering. Bug #3420565
 2011-02-03 18:08:03 -08:00
Stan Chesnutt
eafccc0859 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.

Change-Id: I59e73fbf3dccfbadd1325d3ad5e2997952a28fde
 2011-02-03 17:32:39 -08:00
Jaikumar Ganesh
b3c4efc22d Merge "Wait till SDP records are registered before sending intent." 2011-02-03 17:27:10 -08:00
Eric Laurent
2e8fbebff4 am 6f1bd261: am 9c0a1003: Merge "Fix issue 3371080" into honeycomb 
* commit '6f1bd261b7fd86ac7817ca061dfb55b95150b836':
  Fix issue 3371080
 2011-02-03 17:18:46 -08:00
Cary Clark
39530f8fc7 am 859563eb: am aa7dc928: Merge "stop GL drawing thread before killing WebCore" into honeycomb 
* commit '859563ebf7edbb6d556ef10bac7315fdc564e73a':
  stop GL drawing thread before killing WebCore
 2011-02-03 17:17:45 -08:00
Justin Ho
9b50aebc60 am 7d75cd65: am b732e6d2: Merge "Changing Honeycomb default wallpaper" into honeycomb 
* commit '7d75cd65fa08e9457f6dacb5eb89664a09789dd9':
  Changing Honeycomb default wallpaper
 2011-02-03 17:17:35 -08:00
Romain Guy
b0905c998d am 20bf23e5: am ac14db72: Merge "Fast transform properties setters. Bug #3413510" into honeycomb 
* commit '20bf23e5e4172f5f80ce6c4cc16168355b107f0d':
  Fast transform properties setters. Bug #3413510
 2011-02-03 17:17:21 -08:00
Daniel Sandler
4dce4fc8ea am a2e82d4c: am 6f922cbe: Merge "Implement priority ordering in notifications." into honeycomb 
* commit 'a2e82d4c69bc25eb9f262be0efb4bd38695c4f86':
  Implement priority ordering in notifications.
 2011-02-03 17:16:54 -08:00
Romain Guy
9bd32c235d am 109da7df: am 5bfd1aff: Merge "Allocate layers from the layers pool. Bug #3413433" into honeycomb 
* commit '109da7dfd4c0766274b17467880ee673c731735c':
  Allocate layers from the layers pool. Bug #3413433
 2011-02-03 17:16:19 -08:00
Justin Ho
8e0bf64c6f am 8e2c67ea: am be36f9a3: Merge "Adding new volume control dialog icons" into honeycomb 
* commit '8e2c67ea26d38677802f3029472aa2393f47173d':
  Adding new volume control dialog icons
 2011-02-03 17:15:21 -08:00
Jaikumar Ganesh
50b40cec9c Wait till SDP records are registered before sending intent. 
Wait till all SDP records are registered, before sending STATE_ON intent.
This would fix crashes in Settings app when the profile manager
is not registered.
Problem:
  We were sending Bluetooth State on intent before we got the uuid state
  change intent from Bluez, which is asynchronous.
  Hence when the Settings app queries for the profiles
  to decide if headset profile was registered it would get false and
  the profile manager would be null causing crashes.
  This was not 100 % reproducible, well because it was a race condition.

Change-Id: I791eb63dfbc78aba4c06fd8db933069cb5fde00d
 2011-02-03 17:02:06 -08:00
Adam Powell
86ce68668c am c1be7ac9: Merge "Asset updates for dialog frames and seek bar thumbs" into honeycomb 
* commit 'c1be7ac9121ac8b7b7cfd2205ff928fb0d11fef8':
  Asset updates for dialog frames and seek bar thumbs
 2011-02-03 17:00:10 -08:00
Adam Powell
c1be7ac912 Merge "Asset updates for dialog frames and seek bar thumbs" into honeycomb 2011-02-03 16:57:21 -08:00
Justin Ho
6d1fbba686 am 40523b1b: Merge "Updating default wallpaper" into honeycomb 
* commit '40523b1b27826ee58a101b0450eff74ab14cb0b5':
  Updating default wallpaper
 2011-02-03 16:55:07 -08:00
Justin Ho
40523b1b27 Merge "Updating default wallpaper" into honeycomb 2011-02-03 16:53:40 -08:00
Justin Ho
6e396c0d5c Updating default wallpaper 
Change-Id: I176840dc2c08653827038246f187296029b22af4
 2011-02-03 16:50:19 -08:00
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
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