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

12212 Commits

Author SHA1 Message Date
Joe Onorato
d596d5115c am 070433ed: am 76d9bf52: am 8c65ee2d: Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner a 
Merge commit '070433edee72de5fd9b93ddf055f74277f0deff4'

* commit '070433edee72de5fd9b93ddf055f74277f0deff4':
  Add a method to let a properly permissioned app directly
 2010-07-27 09:26:26 -07:00
Joe Onorato
070433edee am 76d9bf52: am 8c65ee2d: Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone 
Merge commit '76d9bf52f31b8f31f64348b736422861c90ab463' into gingerbread-plus-aosp

* commit '76d9bf52f31b8f31f64348b736422861c90ab463':
  Add a method to let a properly permissioned app directly
 2010-07-27 09:19:48 -07:00
Joe Onorato
76d9bf52f3 am 8c65ee2d: Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone call ends." i 
Merge commit '8c65ee2d509db7dcb50ce4530d52eb5bdca3f917' into gingerbread

* commit '8c65ee2d509db7dcb50ce4530d52eb5bdca3f917':
  Add a method to let a properly permissioned app directly
 2010-07-27 09:14:42 -07:00
Steve Howard
46be2a5bb6 Un-@hide new download manager public API. 
Change-Id: Ia8433160ef40e25fb9408f05f97c7bbfa10a807e
 2010-07-26 20:44:35 -07:00
Brad Fitzpatrick
19bc67e806 am b5daea8a: am eacf0ecd: Merge "Fix StrictMode for Binder.dump()" into gingerbread 
Merge commit 'b5daea8a9f98a7c04377e3f5ad6742add1b925d5'

* commit 'b5daea8a9f98a7c04377e3f5ad6742add1b925d5':
  Fix StrictMode for Binder.dump()
 2010-07-26 19:51:04 -07:00
Brad Fitzpatrick
b5daea8a9f am eacf0ecd: Merge "Fix StrictMode for Binder.dump()" into gingerbread 
Merge commit 'eacf0ecd00f77718ac4570077d729e33b6c320f4' into gingerbread-plus-aosp

* commit 'eacf0ecd00f77718ac4570077d729e33b6c320f4':
  Fix StrictMode for Binder.dump()
 2010-07-26 19:46:45 -07:00
Brad Fitzpatrick
eacf0ecd00 Merge "Fix StrictMode for Binder.dump()" into gingerbread 2010-07-26 19:44:50 -07:00
Xia Wang
69a5a96662 Wait for broadcast even if the network state has been changed. 
bug: 2863356

Change-Id: If279e891cf66fcef465e85b704b0b857f6ac3742
 2010-07-26 18:17:07 -07:00
Adam Powell
6b164fe048 Merge "Moved context modes into view, renamed to action modes" 2010-07-26 18:02:12 -07:00
Jean-Michel Trivi
808616f9cc am fa95b474: am 4a60d618: Fix NPE in TextToSpeech with setLanguage(null) 
Merge commit 'fa95b474fc75849470546b0f18e58b2ca1ed2129'

* commit 'fa95b474fc75849470546b0f18e58b2ca1ed2129':
  Fix NPE in TextToSpeech with setLanguage(null)
 2010-07-26 17:56:20 -07:00
Jean-Michel Trivi
fa95b474fc am 4a60d618: Fix NPE in TextToSpeech with setLanguage(null) 
Merge commit '4a60d61887a20d349e5eb38900dfbcaab06630fc' into gingerbread-plus-aosp

* commit '4a60d61887a20d349e5eb38900dfbcaab06630fc':
  Fix NPE in TextToSpeech with setLanguage(null)
 2010-07-26 17:53:57 -07:00
Brad Fitzpatrick
eb75888e64 Fix StrictMode for Binder.dump() 
Change-Id: I378f5e3d6512d06b46248b9bb6d9c727e3f6bf1d
 2010-07-26 17:47:45 -07:00
Adam Powell
6e34636749 Moved context modes into view, renamed to action modes 
ContextualMode renamed to ActionMode. Adds a reference to the action
bar and reduces confusion around things named "Context".

Change-Id: Ia5098b1d0799a0ece0810c34e6696eda039fb005
 2010-07-26 17:28:45 -07:00
Jean-Michel Trivi
4a60d61887 Fix NPE in TextToSpeech with setLanguage(null) 
getLanguage() can return null, and pass it to setLanguage()
  in TextToSpeech.initTts()

Change-Id: I8046e94959404bd63b0a90bcc2dbf4018f77c110
 2010-07-26 16:11:58 -07:00
Vasu Nori
fb16cbd9b2 add new API in SQLiteStatement to deprecate another. 
1. SQLIteStatement.executeUpdateDelete() replaces execute() - and returns the
number of rows changed.
2. let SQLiteDatabase.execSQL() call the above new API - which
means all CRUD statements by execSQL() are stored in prepared statement cache.
3. remove the following from SQLiteDatabase
     lastrowId
     lastchangecount()
     native_execSQL()

Change-Id: I4e93a09dc381f425c3ae6ccc331a7bf227491e22
 2010-07-26 13:00:07 -07:00
Michael Kolb
37b64de6bc moved target_content user agent parameter to strings 
added target content parameter for xlarge screen configuration

Change-Id: I27d252167d4011beec3784addaa548193ba9e20c
 2010-07-26 12:58:59 -07:00
Mike Lockwood
9765211b90 am 64f04a64: am 70736a6d: Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread 
Merge commit '64f04a645ea4fd81cfb41fba23d9ba9e1279d416'

* commit '64f04a645ea4fd81cfb41fba23d9ba9e1279d416':
  Avoid starting multiple threads in ShutdownThread
 2010-07-26 12:30:28 -07:00
Dianne Hackborn
9fb0bb8292 am b6022e3d: am 14bfa398: Infrastructure to report running services to developer. 
Merge commit 'b6022e3d500f248cf1abe94e8f1509e27ab25736'

* commit 'b6022e3d500f248cf1abe94e8f1509e27ab25736':
  Infrastructure to report running services to developer.
 2010-07-26 12:30:19 -07:00
Dianne Hackborn
4cca89c042 am 3a2ff74f: am 46730fc7: Fix handling of application disabled state. 
Merge commit '3a2ff74fa4c3f014555ec64fccc16e1b9f6d0111'

* commit '3a2ff74fa4c3f014555ec64fccc16e1b9f6d0111':
  Fix handling of application disabled state.
 2010-07-26 12:30:10 -07:00
Dianne Hackborn
48b9cbb046 am 443d884e: am 3bee5af8: Battery stats: start removing last stats, keep total discharge. 
Merge commit '443d884e16fad2e01a97aa788d4b30de53c94048'

* commit '443d884e16fad2e01a97aa788d4b30de53c94048':
  Battery stats: start removing last stats, keep total discharge.
 2010-07-26 12:30:06 -07:00
Mathias Agopian
bf23832acc am fed3c364: am eab07e5c: Merge "Report sensor events to BatteryStats service" into gingerbread 
Merge commit 'fed3c364e6fc6acc5e5836bd1370c3c278f8a248'

* commit 'fed3c364e6fc6acc5e5836bd1370c3c278f8a248':
  Report sensor events to BatteryStats service
 2010-07-26 12:30:01 -07:00
Steve Howard
a272756431 am a08a0a7b: am a13a02cd: New permission for non-purgeable cache downloads. 
Merge commit 'a08a0a7bee7ba09917b94e41c705a643c8e06a1a'

* commit 'a08a0a7bee7ba09917b94e41c705a643c8e06a1a':
  New permission for non-purgeable cache downloads.
 2010-07-26 12:29:49 -07:00
Mike Lockwood
64f04a645e am 70736a6d: Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread 
Merge commit '70736a6d92767258543bb03ac22a705535d86341' into gingerbread-plus-aosp

* commit '70736a6d92767258543bb03ac22a705535d86341':
  Avoid starting multiple threads in ShutdownThread
 2010-07-26 12:25:31 -07:00
Dianne Hackborn
b6022e3d50 am 14bfa398: Infrastructure to report running services to developer. 
Merge commit '14bfa398a4e8697ce5822861a684b7d1245e4a85' into gingerbread-plus-aosp

* commit '14bfa398a4e8697ce5822861a684b7d1245e4a85':
  Infrastructure to report running services to developer.
 2010-07-26 12:24:57 -07:00
Dianne Hackborn
3a2ff74fa4 am 46730fc7: Fix handling of application disabled state. 
Merge commit '46730fc78388607fd562044cbaaa26ffc9f65337' into gingerbread-plus-aosp

* commit '46730fc78388607fd562044cbaaa26ffc9f65337':
  Fix handling of application disabled state.
 2010-07-26 12:24:21 -07:00
Dianne Hackborn
443d884e16 am 3bee5af8: Battery stats: start removing last stats, keep total discharge. 
Merge commit '3bee5af8162c177f8c8f4199489a401058ab26a9' into gingerbread-plus-aosp

* commit '3bee5af8162c177f8c8f4199489a401058ab26a9':
  Battery stats: start removing last stats, keep total discharge.
 2010-07-26 12:24:16 -07:00
Mathias Agopian
fed3c364e6 am eab07e5c: Merge "Report sensor events to BatteryStats service" into gingerbread 
Merge commit 'eab07e5c1d48d45f76ac2dd4a45c8a3457aa290d' into gingerbread-plus-aosp

* commit 'eab07e5c1d48d45f76ac2dd4a45c8a3457aa290d':
  Report sensor events to BatteryStats service
 2010-07-26 12:24:00 -07:00
Steve Howard
a08a0a7bee am a13a02cd: New permission for non-purgeable cache downloads. 
Merge commit 'a13a02cd0ec6c0584fc2423feb974d77d0945964' into gingerbread-plus-aosp

* commit 'a13a02cd0ec6c0584fc2423feb974d77d0945964':
  New permission for non-purgeable cache downloads.
 2010-07-26 12:23:48 -07:00
Xavier Ducrohet
b46507f6b8 am f8c335e8: am f72181c6: Fix hosttests to use the new ddmlib API. 
Merge commit 'f8c335e85a46887de6ca771ad76ff35c713ce0c4'

* commit 'f8c335e85a46887de6ca771ad76ff35c713ce0c4':
  Fix hosttests to use the new ddmlib API.
 2010-07-26 12:01:13 -07:00
Xavier Ducrohet
f8c335e85a am f72181c6: Fix hosttests to use the new ddmlib API. 
Merge commit 'f72181c60943dcfb642aac1dc5fa5416c1bb566e' into gingerbread-plus-aosp

* commit 'f72181c60943dcfb642aac1dc5fa5416c1bb566e':
  Fix hosttests to use the new ddmlib API.
 2010-07-26 11:43:07 -07:00
Gilles Debunne
d24ac17121 am 8cd48574: Fixed bug in BitmapFactory.decodeStream 
Merge commit '8cd48574a755bea86243e9f9eabaee341ecf9c60' into gingerbread-plus-aosp

* commit '8cd48574a755bea86243e9f9eabaee341ecf9c60':
  Fixed bug in BitmapFactory.decodeStream
 2010-07-26 11:41:46 -07:00
Romain Guy
0ada3f41cf Merge "Fix text corruption when rendering RTL enabled text." 2010-07-26 11:39:27 -07:00
Romain Guy
9226298891 Fix text corruption when rendering RTL enabled text. 
Change-Id: I5450fd9cad1c5a66875affdbcd34308aea4c36ac
 2010-07-26 11:17:54 -07:00
Xavier Ducrohet
f72181c609 Fix hosttests to use the new ddmlib API. 
Change-Id: I629876c5baabc1cd8700604c4ebed13cc9e2168d
 2010-07-26 10:53:00 -07:00
Jean-Baptiste Queru
14d9c34ccb am c7ab09ed: Merge "Fix build." 
Merge commit 'c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b' into gingerbread-plus-aosp

* commit 'c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b':
  Fix build.
 2010-07-26 10:05:23 -07:00
Ben Komalo
7cd83428f1 Ensure that creating a Loader/LoaderManager after the Activity has 
started will kick off startLoading() as expected.

Change-Id: I8ec76d39665aab0dc72fb083b6b3751a45b51fce
 2010-07-26 10:03:14 -07:00
Jean-Baptiste Queru
c7ab09ede5 Merge "Fix build." 2010-07-26 09:56:10 -07:00
Mike Lockwood
d67b236497 Avoid starting multiple threads in ShutdownThread 
The previous code allowed this to happen if a second call to shutdown
happened while the dialog was being displayed.

BUG: 2563243

Change-Id: I93adc4ef316917a79002d580b17eda0dc354704c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-26 07:27:23 -04:00
Dianne Hackborn
14bfa398a4 Infrastructure to report running services to developer. 
Change-Id: Id1aae61323e7b8357c5fcc4bc641aaa57f3b6fde
 2010-07-24 20:07:17 -07:00
Dianne Hackborn
46730fc783 Fix handling of application disabled state. 
Change-Id: I617b76e89eeb75437b384b92f1205bb00b15bb70
 2010-07-24 16:34:00 -07:00
Dianne Hackborn
3bee5af816 Battery stats: start removing last stats, keep total discharge. 
Change-Id: I59c4bcbb9893adb237017add76b83c22153f94ef
 2010-07-24 13:36:47 -07:00
Dianne Hackborn
e164eda940 Merge "Add new DialogFragment class." 2010-07-24 11:44:04 -07:00
Dianne Hackborn
dd913a50cd Add new DialogFragment class. 
For all your Dialog needs.

Change-Id: I36c602ca253488d34a55c8f0be610b9752c33264
 2010-07-24 11:42:05 -07:00
Joe Onorato
7999bff154 Add a method to let a properly permissioned app directly 
manipulate the user activity timeout.  We should come up
with a better API for this, but this is for a last minute
power manager hack to turn off the screen sooner after a
phone call ends.

Change-Id: I76422f952e3e894c90b3311e7d889899c79cbbaa
 2010-07-24 11:50:05 -04:00
Romain Guy
bd6fff3ee4 Merge "Add text alignment support to drawText()." 2010-07-23 18:56:32 -07:00
Romain Guy
e8e62a4a03 Add text alignment support to drawText(). 
This change also integrates better support for RTL text.

Change-Id: I6da8f5cf5dc28ca7cf1b22e27b0d853c919e8481
 2010-07-23 18:55:21 -07:00
Mathias Agopian
eab07e5c1d Merge "Report sensor events to BatteryStats service" into gingerbread 2010-07-23 17:03:43 -07:00
Mathias Agopian
32123fde1b Report sensor events to BatteryStats service 
Change-Id: I9b83aa709887aa658bc474391573f2d45b6c4eb2
 2010-07-23 16:55:24 -07:00
Jean-Baptiste Queru
e50282ede7 am 8a13d4e3: am f5c73101: Merge "dependent change for "parse instrumentation result bundles" in sdk" 
Merge commit '8a13d4e3e5a175baddb7b8ca542d9d9941cf24a6'

* commit '8a13d4e3e5a175baddb7b8ca542d9d9941cf24a6':
  dependent change for "parse instrumentation result bundles" in sdk
 2010-07-23 15:34:50 -07:00
Jean-Baptiste Queru
8a13d4e3e5 am f5c73101: Merge "dependent change for "parse instrumentation result bundles" in sdk" 
Merge commit 'f5c7310152cf5537be6997412c1a42dde9fe9ecf' into gingerbread-plus-aosp

* commit 'f5c7310152cf5537be6997412c1a42dde9fe9ecf':
  dependent change for "parse instrumentation result bundles" in sdk
 2010-07-23 15:32:45 -07:00