Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,814 Commits 3 Branches 0 Tags
ddcafcbd62c4efdc70bc626ab210a3c41dd1333c
Commit Graph

24814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Konstantin Lopyrev
ddcafcbd62 Fix 1684100: Making sure that empty package, type and resource ids are not accepted. 
Change-Id: I4c94877e4312e9a5b4d22c8625069ca056c62e40
 2010-06-04 14:37:37 -07:00
Adam Powell
1bba846ed1 Merge "Added ListPopupWindow. Refactored AutoCompleteTextView and Spinner (optionally) to use it. Added associated styles." 2010-06-04 13:33:40 -07:00
The Android Open Source Project
eefd63e357 am 0a0c57f9: am 7c035d8a: am 2d743fe2: merge from open-source master 2010-06-04 13:02:38 -07:00
The Android Open Source Project
0a0c57f929 am 7c035d8a: am 2d743fe2: merge from open-source master 2010-06-04 13:00:37 -07:00
The Android Open Source Project
7c035d8a65 am 2d743fe2: merge from open-source master 
Merge commit '2d743fe2f39397d41334001d897eb78da56e94ef' into kraken

* commit '2d743fe2f39397d41334001d897eb78da56e94ef':
  Add better error handling for savePicture and restorePicture
 2010-06-04 12:58:09 -07:00
Adam Powell
c3fa6304c9 Added ListPopupWindow. Refactored AutoCompleteTextView and Spinner 
(optionally) to use it. Added associated styles.

ListPopupWindow allows apps to present a popup window of options to
the user that will correctly dodge the IME if needed.

Change-Id: I509c6c45036856daab686a6edeb7a9de1e72eb0a
 2010-06-04 12:18:16 -07:00
Vasu Nori
d2cecfd375 fix broken-test 
Change-Id: I3d33cda2e4f1ba68843d6a81b8c624ce4af8519f
 2010-06-04 12:05:58 -07:00
The Android Open Source Project
2d743fe2f3 merge from open-source master 
Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471
 2010-06-04 11:08:36 -07:00
Alex Sakhartchouk
0829f0d51f Merge "Creating the jni and java layer to integrate a3d" 2010-06-04 10:10:24 -07:00
Alex Sakhartchouk
aae74ad614 Creating the jni and java layer to integrate a3d 
Change-Id: I438359633bae59bf9188cd2c4664a92ca16c5f37
 2010-06-04 10:06:50 -07:00
Jaikumar Ganesh
4a575c682b am bcc112b1: am f8acea6c: Merge "Delete local references to avoid reference table overflow." into kraken 2010-06-04 09:49:10 -07:00
Jaikumar Ganesh
bcc112b16a am f8acea6c: Merge "Delete local references to avoid reference table overflow." into kraken 2010-06-04 09:47:47 -07:00
Jaikumar Ganesh
f8acea6ccb Merge "Delete local references to avoid reference table overflow." into kraken 2010-06-04 09:46:03 -07:00
Mike Lockwood
b0ccc7ca75 Merge "MTP: Add support for host cancellation of file transfers." 2010-06-04 07:20:16 -07:00
Mike Lockwood
a82d3c550b MTP: Add support for host cancellation of file transfers. 
Change-Id: I72df423f8017286e41adae525e6fbcb6b8440687
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-04 09:49:21 -04:00
Wu-cheng Li
baff93de27 am ab5e67c6: am cefb01ab: Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken 2010-06-04 03:41:44 -07:00
Wu-cheng Li
ab5e67c60d am cefb01ab: Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken 2010-06-04 03:39:44 -07:00
Wu-cheng Li
cefb01abbf Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken 2010-06-04 03:38:25 -07:00
Wu-cheng Li
8aba232dbc Add KEY_SUPPORTED_METERING_MODES and fix some typos. 
bug:2737111
Change-Id: I108ae7057786921bf99385ad66dbc1f02d6a1448
 2010-06-04 17:18:17 +08:00
Eric Laurent
4b18200b9c am 030a1553: am 2ea200c5: Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken 2010-06-04 00:18:07 -07:00
Eric Laurent
030a15531c am 2ea200c5: Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken 2010-06-04 00:16:05 -07:00
Eric Laurent
2ea200c5a7 Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken 2010-06-04 00:14:46 -07:00
Doug Kwan
77205ace4e Merge "Add missing library to linker command line." 2010-06-03 22:53:25 -07:00
Doug Kwan
bebfb6aa0c Add missing library to linker command line. 
Change-Id: Ia9ddf6e6bb5e72c32372a2f460806b6cbb7ec660
 2010-06-03 22:49:34 -07:00
Wu-cheng Li
3c358eb7bd am 2f98f99c: am 5f5df382: Merge "Add camera metering mode API." into kraken 2010-06-03 22:35:40 -07:00
Wu-cheng Li
2f98f99cd1 am 5f5df382: Merge "Add camera metering mode API." into kraken 2010-06-03 22:33:15 -07:00
Wu-cheng Li
5f5df382e5 Merge "Add camera metering mode API." into kraken 2010-06-03 22:32:05 -07:00
Jing Yu
7ba85e4f42 Merge "Add missing libraries, in order for gold to work." 2010-06-03 21:05:51 -07:00
Jing Yu
42006894ed Add missing libraries, in order for gold to work. 
gold is more strict than ld. If building A depends on libB directly,
we must specify -lB at link time.

Change-Id: Iac7cec58cbae5e0cbcfc9adab924db6733192d20
 2010-06-03 20:53:52 -07:00
Kenny Root
c4a1a927a8 Merge "Fix alignment issues with RTL paragraphs." 2010-06-03 18:26:55 -07:00
Daisuke Miyakawa
d9f89b2201 Merge "Delete vCard code to platform/framework/opt/vcard." 2010-06-03 17:42:23 -07:00
Brad Fitzpatrick
e407a608b0 resolved conflicts for merge of 7d6362de to master 
Change-Id: Ic26dd6d617f0edba549c992256511613df00caa6
 2010-06-03 17:15:48 -07:00
Jaikumar Ganesh
a7c0bdc4e4 Delete local references to avoid reference table overflow. 
Change-Id: I2218b97647e381bfe6d329b1b6134bb76c1832b6
 2010-06-03 16:59:01 -07:00
Vasu Nori
df0089e1d2 Merge "set some members to final, set database errorhandler to default if null." 2010-06-03 16:46:31 -07:00
Brad Fitzpatrick
7d6362de06 am 266b74e8: Merge "Sprinkle new BlockGuard around SQLiteDatabase." into kraken 2010-06-03 16:09:35 -07:00
Brad Fitzpatrick
266b74e875 Merge "Sprinkle new BlockGuard around SQLiteDatabase." into kraken 2010-06-03 16:07:51 -07:00
Vasu Nori
2134369e80 set some members to final, set database errorhandler to default if null. 
Change-Id: I1c2d8181e7fe60c869178a43dcc00519dd0072c7
 2010-06-03 16:01:39 -07:00
Andreas Huber
8fd2913a7d am 17dabbdf: am b8c7548d: am e896d416: am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo 2010-06-03 15:35:35 -07:00
Andreas Huber
17dabbdf86 am b8c7548d: am e896d416: am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo 2010-06-03 15:33:35 -07:00
Andreas Huber
b8c7548df6 am e896d416: am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo 
Merge commit 'e896d41699ffe7be932102d7ccc9566f41ddb447' into kraken

* commit 'e896d41699ffe7be932102d7ccc9566f41ddb447':
  Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
 2010-06-03 15:31:56 -07:00
Andreas Huber
e896d41699 am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo 
Merge commit '2e3761ba43f634e97ac493f4b79e5e53954a1491' into froyo-plus-aosp

* commit '2e3761ba43f634e97ac493f4b79e5e53954a1491':
  Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
 2010-06-03 15:30:03 -07:00
Andreas Huber
2e3761ba43 Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo 2010-06-03 15:28:13 -07:00
Daisuke Miyakawa
fe5b3e981d Delete vCard code to platform/framework/opt/vcard. 
Now all the code and related tests are in (top)/framework/opt/vcard.

See also 33mb46cb82 in platform/framework/opt/vcard.

Bug: 2735156
Change-Id: Ic3413110580874761e596b8fe9ad3c2e3c60795b
 2010-06-03 15:22:10 -07:00
Vasu Nori
97efcf11d8 Merge "fix docs errors" 2010-06-03 14:59:51 -07:00
Vasu Nori
03acd51bae fix docs errors 
Change-Id: I775dc3e665a8ce32ed6c95f3240280ddef984bb6
 2010-06-03 14:44:39 -07:00
Andreas Huber
3c460f3da0 Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle. 
Change-Id: I03dbdac3cd250340059ea43b341129b30acce4e2
related-to-bug: 2736779
 2010-06-03 14:43:57 -07:00
Romain Guy
fb59fbf14e Merge "Add better error handling for savePicture and restorePicture" 2010-06-03 14:26:21 -07:00
Jesse Wilson
f6aa6185a4 Merge "Preloaded class list problems shall no longer break the build." 2010-06-03 14:24:56 -07:00
Doug Felt
c982f60e98 Fix alignment issues with RTL paragraphs. 
Also remove unused debugging code that depends on junit.
Remove trailing whitespace in changed code.

Change-Id: Ie02d1b8220c599a672ee6e91af0fba634e0f620c
 2010-06-03 13:33:00 -07:00
Dirk Dougherty
7c0761052e am b7371455: am c458d0e3: am b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo 2010-06-03 13:04:01 -07:00