18729 Commits

Author SHA1 Message Date
Romain Guy
44e3b0d034 am f44ed5ad: Merge "Don\'t clobber the local dirty rect after rendering a layer. Bug #3417254 Bug #3413433" into honeycomb
* commit 'f44ed5adc42fefa0c91fc79c5e3c20e1cdc7d697':
  Don't clobber the local dirty rect after rendering a layer. Bug #3417254 Bug #3413433
2011-02-02 16:47:09 -08:00
Vasu Nori
99e8e04702 am 6bc710f7: Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb
* commit '6bc710f769618e87b98d51cd02241e6b1a2fb653':
  bug:3414192 new API to designate a download to be OTA update
2011-02-02 16:47:05 -08:00
Romain Guy
f44ed5adc4 Merge "Don't clobber the local dirty rect after rendering a layer. Bug #3417254 Bug #3413433" into honeycomb 2011-02-02 16:44:07 -08:00
Vasu Nori
6bc710f769 Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb 2011-02-02 16:43:56 -08:00
Irfan Sheriff
aec39e625b Merge "resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-02-02 16:03:29 -08:00
Irfan Sheriff
d6d2de6b3c resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp
Change-Id: I34d034115362f0f858fb65710165bd6cad2fdbd5
2011-02-02 16:02:37 -08:00
Leon Scroggins
8287edd3ae am 8257e4d7: Merge "DO NOT MERGE. Only scroll if the IME is open in certain cases." into honeycomb
* commit '8257e4d7e2b1ac9b8310a326cf8f4b53aba760ec':
  DO NOT MERGE. Only scroll if the IME is open in certain cases.
2011-02-02 15:52:00 -08:00
Romain Guy
62687ec12c Don't clobber the local dirty rect after rendering a layer.
Bug #3417254
Bug #3413433

Change-Id: I8045e9ec414ebe4ce4d38124142a00726d2c634d
2011-02-02 15:44:19 -08:00
Vasu Nori
72725ebcad bug:3414192 new API to designate a download to be OTA update
Change-Id: Iae2f6185e130324ad956f594e78b1d8b2176c808
2011-02-02 15:08:49 -08:00
Irfan Sheriff
ec348b4953 resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp
Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c
2011-02-02 14:23:10 -08:00
Irfan Sheriff
0a4b3fd93b two digit number handling in croatia and serbia
If users dial 92-96, dial them normally and not treat
as USSD

Change-Id: If3b6cb37b7ec0ff99d76cb10cba53368094a0b5d
Signed-off-by: sj2202.park@samsung.com
2011-02-02 14:08:38 -08:00
Leon Scroggins
8257e4d7e2 Merge "DO NOT MERGE. Only scroll if the IME is open in certain cases." into honeycomb 2011-02-02 13:41:19 -08:00
Jim Miller
c2c2360bf1 am 22d23eb5: Merge "Fix 3410155: Remove hint text from password entry field." into honeycomb
* commit '22d23eb5d1093a6525621db211b2f4ac4983c6ba':
  Fix 3410155: Remove hint text from password entry field.
2011-02-02 13:19:57 -08:00
Jim Miller
22d23eb5d1 Merge "Fix 3410155: Remove hint text from password entry field." into honeycomb 2011-02-02 12:41:07 -08:00
Leon Scroggins
e89d6418be DO NOT MERGE. Only scroll if the IME is open in certain cases.
Bug:3411564

Requires a change in external/webkit.

Already submitted to master.

Change-Id: Id5b8765bde4070f04fce0743c56a038f88e816ec
2011-02-02 15:05:30 -05:00
Jim Miller
4c573605d0 Fix 3410155: Remove hint text from password entry field.
Change-Id: I36882a365e721f038366fea086a0727c9608bf67
2011-02-02 10:24:56 -08:00
Justin Ho
8dd81a2b02 am c2e16dc6: Merge "Removing red cross from hdpi emergency symbol" into honeycomb
* commit 'c2e16dc6da4f0727e79f61b0b1d85116a7840f28':
  Removing red cross from hdpi emergency symbol
2011-02-02 08:36:39 -08:00
Justin Ho
c2e16dc6da Merge "Removing red cross from hdpi emergency symbol" into honeycomb 2011-02-02 08:33:45 -08:00
Justin Ho
a16eb1a77f Removing red cross from hdpi emergency symbol
Change-Id: Ic4b5ac44f267395ee50414ebf4ce717f45030439
2011-02-02 08:32:39 -08:00
Romain Guy
57188f0d1d am c1f8bcff: Merge "Fix incorrect dirty rectangle transformation in hardware layers. Bug #3413433" into honeycomb
* commit 'c1f8bcffb8612ef5bdddc4bca6eca23804cbe453':
  Fix incorrect dirty rectangle transformation in hardware layers. Bug #3413433
2011-02-02 00:49:31 -08:00
Romain Guy
c1f8bcffb8 Merge "Fix incorrect dirty rectangle transformation in hardware layers. Bug #3413433" into honeycomb 2011-02-02 00:47:21 -08:00
Romain Guy
beff8d83ef Fix incorrect dirty rectangle transformation in hardware layers.
Bug #3413433

Change-Id: Iba201c7c4b4f11937797f3afcbf20c5a7395be25
2011-02-01 23:53:34 -08:00
Romain Guy
debeeef504 am d51eaa64: Merge "Update layers based on the dirty region. Bug #3413433" into honeycomb
* commit 'd51eaa64e3f2d9684b2dd18ebd67734f4e0e7801':
  Update layers based on the dirty region. Bug #3413433
2011-02-01 23:07:54 -08:00
Romain Guy
d51eaa64e3 Merge "Update layers based on the dirty region. Bug #3413433" into honeycomb 2011-02-01 23:05:35 -08:00
Romain Guy
3a3133d876 Update layers based on the dirty region.
Bug #3413433

This helps Launcher when a widget updates during a scroll, or when interacting
with widgets on the workspace if layers are still turned on.

Change-Id: Ic7a42eb34f74f4ae988039754f815e2efd1d1e4f
2011-02-01 23:01:43 -08:00
Romain Guy
a42ee6994b am 518813ec: Merge "New API to let apps draw without layers. Bug #3413433" into honeycomb
* commit '518813ec13153c7b02fb417720f353330e5d946e':
  New API to let apps draw without layers. Bug #3413433
2011-02-01 22:04:31 -08:00
Romain Guy
518813ec13 Merge "New API to let apps draw without layers. Bug #3413433" into honeycomb 2011-02-01 22:02:00 -08:00
Wink Saville
ff34565fcb am 1bf518d8: Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb
* commit '1bf518d8b333768e26bacf340f88f7d4ba8b9a91':
  Add TelephonyManager.getCurrentPhoneType
2011-02-01 21:03:58 -08:00
Wink Saville
1bf518d8b3 Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb 2011-02-01 21:02:10 -08:00
Michael Jurka
3b723ace40 am 46ab5e13: Merge "add missing call to superclass method" into honeycomb
* commit '46ab5e13f27324d634ff27b7fd75c5d432b915bf':
  add missing call to superclass method
2011-02-01 20:55:15 -08:00
Michael Jurka
b8f939fb57 add missing call to superclass method 2011-02-01 20:50:30 -08:00
Wink Saville
9d72be3318 Add TelephonyManager.getCurrentPhoneType
The new method getCurrentPhoneType has the old behavior of getPhoneType
and does not check for voice capable. This allows code to assume
the old behavior.

bug: 3198435
Change-Id: I0542838ceca2f757cceb6cd7f795e95fe886523e
2011-02-01 19:22:15 -08:00
Ben Murdoch
6a48ba740e am 3b8657de: Merge "Move setExpandedTileBounds from WC to UI thread" into honeycomb
* commit '3b8657debcbcf1bb4e66ac797d7ea15d737ecb42':
  Move setExpandedTileBounds from WC to UI thread
2011-02-01 18:39:51 -08:00
Ben Murdoch
3b8657debc Merge "Move setExpandedTileBounds from WC to UI thread" into honeycomb 2011-02-01 18:37:43 -08:00
Ben Murdoch
fa148f6889 Move setExpandedTileBounds from WC to UI thread
Bug: 3412928
Change-Id: I2d5c8cc1ba188152dd570ef3a0f2f2f14d64465f
2011-02-02 02:27:40 +00:00
Brian Muramatsu
0872e36ccb am 1d696fa4: Merge "Fix Incorrect Times in TimePickerDialog" into honeycomb
* commit '1d696fa45881ff234c9b76eef8ee5aab444ba918':
  Fix Incorrect Times in TimePickerDialog
2011-02-01 18:10:59 -08:00
Brian Muramatsu
1d696fa458 Merge "Fix Incorrect Times in TimePickerDialog" into honeycomb 2011-02-01 18:09:36 -08:00
Brian Muramatsu
87879e8ef9 Fix Incorrect Times in TimePickerDialog
Bug 3414311

TimePicker#setCurrentHour subtracts 12 from the given hour if
is24HourView returns false. TimePickerDialog calls setCurrentHour before
setIs24HourView, so the 12 will always be substracted from the time.
Reorder the statements so that TimePickerDialog sets is24HourView,
before setting the hour and time.

Change-Id: Ib997397b04dbdd767e67806aea7614426019e938
2011-02-01 17:56:29 -08:00
Romain Guy
849d0a37cf New API to let apps draw without layers.
Bug #3413433

Launcher now enables layers all the time, but in some cases (for instance, when the
workspace is not scrolling,) it is more efficient to draw without the layer.

Change-Id: I625fb5b48506acda9ae75356fdbbe812c85f2aab
2011-02-01 17:56:09 -08:00
Jaikumar Ganesh
25bbfda244 am 485d577a: Merge "Fix BluetoothAdapter Connection change intent doc." into honeycomb
* commit '485d577af1b410769e1a364d8e2bf7837fb313b0':
  Fix BluetoothAdapter Connection change intent doc.
2011-02-01 17:08:46 -08:00
Jaikumar Ganesh
485d577af1 Merge "Fix BluetoothAdapter Connection change intent doc." into honeycomb 2011-02-01 17:06:56 -08:00
Jaikumar Ganesh
0b5b35f8a1 Fix BluetoothAdapter Connection change intent doc.
Bug: 3414206
Change-Id: Icf87e28e11b0b5072fe546225bbfb1dc68487ef0
2011-02-01 16:53:14 -08:00
Dianne Hackborn
d48ba867d6 am e77f9914: Merge "Whoops, need to put this check back." into honeycomb
* commit 'e77f99144f015d9044909a4c128fa916465b0671':
  Whoops, need to put this check back.
2011-02-01 16:53:09 -08:00
Dianne Hackborn
e77f99144f Merge "Whoops, need to put this check back." into honeycomb 2011-02-01 16:50:44 -08:00
Dianne Hackborn
a48a37f025 Whoops, need to put this check back.
We still don't want third party wallpapers to be able to do this,
since it can't work with all window animations.

Change-Id: I97c8ef78c36bd89bf47a7c4533ed1c244dcff4a6
2011-02-01 16:30:38 -08:00
Dianne Hackborn
2a70a1e349 am bd77ed7f: Merge "Make image wallpaper use a big surface." into honeycomb
* commit 'bd77ed7fff87b79008e3b071115674dff2721994':
  Make image wallpaper use a big surface.
2011-02-01 16:26:12 -08:00
Dianne Hackborn
bd77ed7fff Merge "Make image wallpaper use a big surface." into honeycomb 2011-02-01 16:23:47 -08:00
Dianne Hackborn
f185552f63 Make image wallpaper use a big surface.
Change-Id: I119f2bfee5fde08040520bd0da8574194a893ab5
2011-02-01 16:20:20 -08:00
Jean-Baptiste Queru
068f3ef956 am 066e1e3c: am dbf09fee: am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"
* commit '066e1e3cc6a0a3f2fbf672b82f8e3317574b86da':
  Don't crash zygote if webcore fails to load
2011-02-01 14:48:21 -08:00
Romain Guy
1c531f4a44 am f222956c: Merge "Correctly set the alpha of a hardware layer before drawing it. Bug #3410819" into honeycomb
* commit 'f222956c955c97cf436c6f18b50bd0e57c89f381':
  Correctly set the alpha of a hardware layer before drawing it. Bug #3410819
2011-02-01 14:33:01 -08:00