Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,485 Commits 3 Branches 0 Tags
f13b44529467995d7608883a65bc4c4e07cc5363
Commit Graph

994 Commits

Author SHA1 Message Date
Nick Pelly
cc82f3ae3c am 6fb9316f: am 38e561dd: Merge "Remove timeout support." into gingerbread 
* commit '6fb9316f6bd72b406bbfc61bd210281744eea9c1':
  Remove timeout support.
 2010-11-03 10:59:54 -07:00
Adam Powell
81b8944131 Fix bug 3093591 - add richer control over default tab selection in ActionBar 
Added overloads to ActionBar#addTab with control over whether the added tab
will become selected or not. Old versions implemented in terms of the new.

Change-Id: I810c64652bb7e755b81151ce8a2c765266d78a66
 2010-11-02 18:18:37 -07:00
Romain Guy
5b3b35296e Optimize FBO drawing with regions. 
This optimization is currently disabled until Launcher is
modified to take advantage of it. The optimization can be
enabled by turning on RENDER_LAYERS_AS_REGIONS in the
OpenGLRenderer.h file.

Change-Id: I2fdf59d0f4dc690a3d7f712173ab8db3848b27b1
 2010-11-02 16:17:23 -07:00
Nick Pelly
6fb9316f6b am 38e561dd: Merge "Remove timeout support." into gingerbread 
* commit '38e561dd3cd72160035d8b3002fc9bbaf3071374':
  Remove timeout support.
 2010-11-02 14:49:35 -07:00
Nick Pelly
275708c82c Remove timeout support. 
The implementation was guarenteed to cause deadlock when a timeout was set.

Change-Id: I59444ea784eb9057c6c4c9e9123f558b3ef5eef6
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-11-02 16:13:52 -05:00
Brian Carlstrom
504d5e0d1f Change SamplingProfiler to use a sampling interval instead of Hz 
Change-Id: I15654f1c080215575347559a16ba40e9630371ba
 2010-11-01 10:41:53 -07:00
Joe Onorato
e4c7b3f25e Status bar: Forward the disabled state to the status bar process when it comes up. 
Bug: 3108996
Change-Id: I92c2ff645dc64ca2610e3de814e0cfef6cde88c3
 2010-10-30 12:15:03 -07:00
Adam Powell
9ab978713c Action bar API updates - new display options 
Change-Id: I55e56cd7aafa53994990079e88ef85e4eb1a0b3f
 2010-10-29 15:32:53 -07:00
Daisuke Miyakawa
4c5585d8af Merge "Expose Adapter." 2010-10-29 11:27:59 -07:00
satok
06487a58be Add a functionarity for showing / hiding IME button on the system bar 
Bug: 3077030

- IME communicates with status bar directly.

Change-Id: Ic5b6b5b7a2b8ea62372dcc9b9c36d81b9f2db651
 2010-10-30 03:17:40 +09:00
Wink Saville
9d9f0c20a6 Remove an @Override that is not needed. 
Change-Id: I23d216c387ea44073eed1e3acb05d07104784e16
 2010-10-28 14:38:49 -07:00
satok
04d5020470 Show Subtype Icon properly in the system status bar 
- Added API for getting the current subtype
- Added functions for show/hide status icon

Change-Id: Ifcaad00f7f4c658cdb3af367387476bbf316eb19
 2010-10-28 16:18:50 +09:00
Andy McFadden
091511b41b am e3e8642c: am 001c7d12: Merge "Set capabilities sooner." into gingerbread 2010-10-27 13:28:17 -07:00
Andy McFadden
e3e8642ce4 am 001c7d12: Merge "Set capabilities sooner." into gingerbread 2010-10-27 13:25:29 -07:00
Andy McFadden
1b4c7966b1 Set capabilities sooner. 
Bug 3135433.

Change-Id: I4e34b60c0a01b85ce0d80eb96ff3510604a68c71
 2010-10-27 11:26:05 -07:00
satok
86417ea3f8 Remove InputMethodAndSubtypeEnabler and call intent of Settings.ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER 
Change-Id: I467cfba9644ec266f6a98f7aec0886ad205fef4f
 2010-10-27 15:27:22 +09:00
Daisuke Miyakawa
53daead571 Expose Adapter. 
We sometimes want just an adapter object instead of Fragment,
so that it can be available from not-Fragment UI
(like Spinner and ListView).

See I5e3d7ee721d1f0ec81dc9825b0d05f8faa731b80 for example usage.

Bug: 3133251
Change-Id: Ief6f25e9bc51c739b5cd2f2ba0afec5d2c16dc5b
 2010-10-26 16:09:14 -07:00
Jeff Hamilton
858825c54d am 6a49bff5: am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:28:57 -07:00
Jeff Hamilton
6a49bff569 am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:24:57 -07:00
Jeff Hamilton
d6c052a8ec Make some contructors public but hidden. 
This allows them to be used from within the
NFC stack process internally.

Change-Id: I7f81759da63d451efe86550a57a400fb224b2064
 2010-10-26 08:59:18 -05:00
Adam Powell
a139f102d8 Merge "Fix bug 3105695 - Action modes in dialogs or other small windows" 2010-10-22 17:52:01 -07:00
Adam Powell
85446e95af Fix bug 3105695 - Action modes in dialogs or other small windows 
Overlay action modes now show in their own windows aligned to the top
of the screen.

Change-Id: I81600bbd1bcaeb59fdcf0a959bd35f82165baa2c
 2010-10-22 17:45:31 -07:00
Jaikumar Ganesh
5a1e4cf83f Update BT APIs return type from Set to List. 
Change-Id: Ia27220dd26cde13007f6938c830517ee7f6968ce
 2010-10-22 11:36:28 -07:00
Dianne Hackborn
c981465aac am 2f1eee34: am e9dbf208: Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread 
Merge commit '2f1eee34706cf42855541def5737c37a071d7293'

* commit '2f1eee34706cf42855541def5737c37a071d7293':
  Fix issue #3117472: Format storage dialog still broken
 2010-10-21 17:44:40 -07:00
Dianne Hackborn
2f1eee3470 am e9dbf208: Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread 
Merge commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307' into gingerbread-plus-aosp

* commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307':
  Fix issue #3117472: Format storage dialog still broken
 2010-10-21 17:35:12 -07:00
Dianne Hackborn
4f6ee254bc Fix issue #3117472: Format storage dialog still broken 
Change-Id: I19b3a04e33785a56cb14457e4e3cd9232f585bb1
 2010-10-21 16:39:53 -07:00
Dianne Hackborn
6dcab2099b am 153bf6c8: am e9e23405: Merge "Fix issue #3113424: Battery stats don\'t reset on Crespo" into gingerbread 
Merge commit '153bf6c8d7579abca63909424a8602a0f3b8bcd4'

* commit '153bf6c8d7579abca63909424a8602a0f3b8bcd4':
  Fix issue #3113424: Battery stats don't reset on Crespo
 2010-10-21 13:44:47 -07:00
Brad Fitzpatrick
385a753dea resolved conflicts for merge of 368fdba4 to master 
Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
 2010-10-21 07:39:10 -07:00
Wink Saville
d20a5d6b5a Add AsyncChannel and AsyncService. 
Change-Id: Ie6f9aed58f49defcd1c051611ce791e2e62a9474
 2010-10-20 15:17:28 -07:00
Dianne Hackborn
153bf6c8d7 am e9e23405: Merge "Fix issue #3113424: Battery stats don\'t reset on Crespo" into gingerbread 
Merge commit 'e9e23405833a5fedb6a1c2dcec87d84e39d1d13d' into gingerbread-plus-aosp

* commit 'e9e23405833a5fedb6a1c2dcec87d84e39d1d13d':
  Fix issue #3113424: Battery stats don't reset on Crespo
 2010-10-20 14:10:29 -07:00
Dianne Hackborn
266e607bde Fix issue #3113424: Battery stats don't reset on Crespo 
Change-Id: I38cc3cdfa9cb1466fe3659f001ee57aecf9df179
 2010-10-20 12:26:48 -07:00
Adam Powell
7f9b90542e Add ActionBar tab callback method onTabReselected 
onTabReselected is called if an already-selected tab is chosen again.
For many apps this will be a no-op, but some may treat it as a signal
to return to the top level of a given navigation category.

Change-Id: Ic51fbe477b979562f2d848c4070b2016b217a90f
 2010-10-19 17:18:20 -07:00
Brad Fitzpatrick
6be063d8a9 am 5a67749a: am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread 
Merge commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1'

* commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1':
  Fix Vibrator permission CTS test broken earlier.
 2010-10-19 13:38:00 -07:00
Joe Onorato
368fdba47a am bdf1706a: Merge "Reduce logging." into gingerbread 
Merge commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306' into gingerbread-plus-aosp

* commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306':
  Reduce logging.
 2010-10-19 12:29:43 -07:00
Brad Fitzpatrick
5a67749a35 am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread 
Merge commit '987e8d7f9748018d3fee5778645b267a9ee06ff6' into gingerbread-plus-aosp

* commit '987e8d7f9748018d3fee5778645b267a9ee06ff6':
  Fix Vibrator permission CTS test broken earlier.
 2010-10-19 12:25:46 -07:00
Joe Onorato
bdf1706ac6 Merge "Reduce logging." into gingerbread 2010-10-19 12:23:51 -07:00
Joe Onorato
431bb22695 Reduce logging. 
Remember, the system and main logs are
    - Shared resources
    - Primarily for recording problems
    - To be used only for large grained events during normal operation

Bug: 3104855
Change-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7
 2010-10-19 15:08:05 -04:00
Brad Fitzpatrick
26e9cf38b2 Fix Vibrator permission CTS test broken earlier. 
Bug: 3106964
Change-Id: I76138780ac64f761fe09ef8ba74382c7ee05d794
 2010-10-19 11:02:20 -07:00
Nick Pelly
c5469bd67a am 774b943f: am d1f7f4a6: Move hidden API\'s Llcp* and P2p* to f/b/c/j/com/android/internal/nfc. 
Merge commit '774b943fc6baa7d3e2880382d4dc7ab085d54b65'

* commit '774b943fc6baa7d3e2880382d4dc7ab085d54b65':
  Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
 2010-10-18 16:39:30 -07:00
Kenny Root
027610a76e resolved conflicts for merge of 964eb438 to master 
Change-Id: I0c54d6b88356d8734d7f51234b0114434414502e
 2010-10-18 13:03:35 -07:00
Romain Guy
65202242de am 157fa0ac: am 77c011ba: Set default heap size to 5MB. 
Merge commit '157fa0aca55b8e4747f00d2b729e5e361dea7ddb'

* commit '157fa0aca55b8e4747f00d2b729e5e361dea7ddb':
  Set default heap size to 5MB.
 2010-10-18 10:33:17 -07:00
Dianne Hackborn
875ecaa511 am 13e46665: am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to have their UID changed over time." into gingerbread 
Merge commit '13e46665ff69c1a37880762d7d611aacdf02dac7'

* commit '13e46665ff69c1a37880762d7d611aacdf02dac7':
  Work on issue #3101415: Crespo apps seem to have their UID changed over time.
 2010-10-18 08:04:47 -07:00
Nick Pelly
cd0e839a24 NFC: Move NFC service implementation out of system_server. 
NFC service is now an application service in packages/apps/Nfc.

NFC service is registered through ServiceManager.addService(), and the proxy
object NfcAdapter obtains a handle to it through ServiceManager.getService().

**Important** Had to add new symbols AID_NFC / NFC_UID / android.uid.nfc and
modify service_manager.c, Process.java and PackageManagerService.java in order
to force the com.android.nfc process to take a fixed uid, so that it can use
ServiceManager.addService().

Most of the JNI has moved to packages/apps/Nfc/jni. However NdefRecord and
NdefMessage require some in-process native code, so android_com_NdefMessage.cpp
and android_com_NdefRecord.cpp stay in frameworks/base/core/jni. They link to
a very small library libnfc_ndef.so that implements NDEF message parsing. This
has been added to core.mk so all devices (even without NFC hardware) can work
with NDEF data.

Bug: 3041259
Bug: 3097445
Change-Id: If7f00cd8f2053acfc9319ca366d4a9c02bd396e6
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-17 18:35:29 -07:00
Nick Pelly
774b943fc6 am d1f7f4a6: Move hidden API\'s Llcp* and P2p* to f/b/c/j/com/android/internal/nfc. 
Merge commit 'd1f7f4a68375f879671d300510f23d3ee78a500e' into gingerbread-plus-aosp

* commit 'd1f7f4a68375f879671d300510f23d3ee78a500e':
  Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
 2010-10-17 17:50:20 -07:00
Nick Pelly
d1f7f4a683 Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc. 
Change-Id: I9bb67de2956b1ecb765ca4ac142ed9455060bec4
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-17 16:30:40 -07:00
Dianne Hackborn
964eb4389b am 42499170: Implement issue #3094621 and #3094609 - wipe sd card 
Merge commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0' into gingerbread-plus-aosp

* commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0':
  Implement issue #3094621 and #3094609 - wipe sd card
 2010-10-16 16:51:13 -07:00
Dianne Hackborn
424991704b Implement issue #3094621 and #3094609 - wipe sd card 
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command

Also since we have decided that it is important to consider
the Crespo storage as internal storage, DevicePolicyManager
gets a new API to be able to wipe it.  (No big deal, since
all of the work for this is now done in the implementation
of the new UI.)

Change-Id: I32a77c410f710a87dcdcbf6586c09bd2e48a8807
 2010-10-16 16:32:15 -07:00
Brad Fitzpatrick
da3fe88b2d am 33476b2d: am feebaf35: Merge "Don\'t crash on null Vibrator during reboot." into gingerbread 
Merge commit '33476b2db82b5a7f025eb9625fa56f94290e97f4'

* commit '33476b2db82b5a7f025eb9625fa56f94290e97f4':
  Don't crash on null Vibrator during reboot.
 2010-10-16 09:13:39 -07:00
Romain Guy
157fa0aca5 am 77c011ba: Set default heap size to 5MB. 
Merge commit '77c011ba75ee1403c9b7626e4676cd3c8746605b' into gingerbread-plus-aosp

* commit '77c011ba75ee1403c9b7626e4676cd3c8746605b':
  Set default heap size to 5MB.
 2010-10-15 19:23:32 -07:00
Romain Guy
77c011ba75 Set default heap size to 5MB. 
Change-Id: Iac8ae3cbe6b431767776653c9f430983172cfb6f
 2010-10-15 19:15:25 -07:00