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

37111 Commits

Author SHA1 Message Date
Scott Main
b484f8e1a4 am 782b0f71: am 4459827f: am 25505f95: am cdf5106a: docs: a few doc bugs 
* commit '782b0f7141972e0535f1e905d650073f4e7f55dd':
  docs: a few doc bugs
 2013-01-08 20:21:17 -08:00
Scott Main
782b0f7141 am 4459827f: am 25505f95: am cdf5106a: docs: a few doc bugs 
* commit '4459827f7db379031e658b2153aac1f7c882adc6':
  docs: a few doc bugs
 2013-01-08 20:18:35 -08:00
Scott Main
25505f959c am cdf5106a: docs: a few doc bugs 
* commit 'cdf5106aafb77d17584d5401b207cbcc7a20f5f3':
  docs: a few doc bugs
 2013-01-08 20:13:40 -08:00
Scott Main
cdf5106aaf docs: a few doc bugs 
Change-Id: I20d2ff2f3abfe674ca20f713c7213ee031c9bb1d
 2013-01-08 20:07:31 -08:00
Scott Main
8a05d13ef6 am 5b56d432: am 9107fa5d: am 66adf0d0: am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev 
* commit '5b56d43237d959403bb8a32de25376deee2dab22':
  docs: resolve bugs from external tracker
 2013-01-08 12:52:38 -08:00
Scott Main
5b56d43237 am 9107fa5d: am 66adf0d0: am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev 
* commit '9107fa5d7ca1b928e10ffc9395b2f2eb38db7a14':
  docs: resolve bugs from external tracker
 2013-01-08 12:45:36 -08:00
Scott Main
66adf0d04d am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev 
* commit '70af3cdb90bafc081ffa693a350b95ced48b6cfd':
  docs: resolve bugs from external tracker
 2013-01-08 12:42:10 -08:00
Scott Main
6aad995042 docs: resolve bugs from external tracker 
Change-Id: I680970ec63701197103f6c5ab55c25c736aa0519
 2013-01-08 12:02:38 -08:00
Dake Gu
05d485044b am af6dd103: Merge "fix ImageView.getImageMatrix()" into jb-mr1-aah-dev 
* commit 'af6dd103bd2bb0783b9364c703c2623260496d5c':
  fix ImageView.getImageMatrix()
 2013-01-07 18:13:30 -08:00
Dianne Hackborn
c02bbfb3ea am 9fae2ecc: Merge "Handle nested folder case" 
* commit '9fae2ecc5fb777230bde74e4a099fb4e98bf34b4':
  Handle nested folder case
 2013-01-07 15:56:20 -08:00
Dianne Hackborn
9fae2ecc5f Merge "Handle nested folder case" 2013-01-07 15:20:45 -08:00
Dianne Hackborn
2a8de804a2 am 350d5168: Merge "Correcting typo in doc of MEDIA_XXX intents" 
* commit '350d5168e495c642873ee511d4e8dc27ac5377ce':
  Correcting typo in doc of MEDIA_XXX intents
 2013-01-07 12:16:40 -08:00
Dianne Hackborn
138a3d3f1a am d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() documentation wtf." 
* commit 'd5d6f04f2ab0db0aea03e3ab1cdd378fcc952bad':
  Hopefully fix PendingIntent.getActivities() documentation wtf.
 2013-01-07 12:16:23 -08:00
Dianne Hackborn
350d5168e4 Merge "Correcting typo in doc of MEDIA_XXX intents" 2013-01-07 11:21:54 -08:00
Dianne Hackborn
d5d6f04f2a Merge "Hopefully fix PendingIntent.getActivities() documentation wtf." 2013-01-07 11:19:11 -08:00
Brian Carlstrom
bc7d5a55b2 am 537fb0af: Merge "Use most specific attributes for distinguished name display" 
* commit '537fb0afe24a520e7b9a2442786b6fb4fe194392':
  Use most specific attributes for distinguished name display
 2013-01-04 15:47:39 -08:00
Brian Carlstrom
91154ce658 Use most specific attributes for distinguished name display 
Bug: 7894348
Bug: http://code.google.com/p/android/issues/detail?id=41662
Change-Id: I8048a53b8a9a17b384f12b6a4f40071bb3dd3e04
 2013-01-04 15:27:24 -08:00
suyi Yuan
be7af83829 Correcting typo in doc of MEDIA_XXX intents 
Correcting typo in documents of MEDIA_MOUNTED,
MEDIA_UNMOUNTED,MEDIA_UNMOUNTABLE intents, which
may be confusing to APP developers.

Change-Id: Id909b7bfad98e305b8054978f054f4fb9b705311
 2013-01-04 21:21:59 +08:00
Roger Chen
1740ada533 Handle nested folder case 
Change-Id: Id6d6a5899e8255d18192adbc766d8d9a0e6825d0
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
 2013-01-03 18:39:34 -08:00
Adam Powell
b7de79d027 am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected" 
* commit '41bb82becea5dd1f995dbca5bf5a719f559102de':
  Fix NullpointException problem in onMenuItemSelected
 2013-01-03 17:37:49 -08:00
Adam Powell
41bb82bece Merge "Fix NullpointException problem in onMenuItemSelected" 2013-01-03 16:46:03 -08:00
Dake Gu
1ee60179bb fix ImageView.getImageMatrix() 
getImageMatrix() does not return "mDrawMatrix",  instead it returns
mMatrix.  This is not reflecting the matrix used in drawing when
Bitmap is changed and mDrawMatrix is set to null while mMatrix still
holds old invalid data.

Change-Id: If24c3118068eca70cfe15786f9715d95c4499f3b
 2013-01-03 15:11:43 -08:00
Elliott Hughes
2fbc67abb9 am 5cb0f218: Merge "StringBlock_nativeCreate: Possible Leak" 
* commit '5cb0f2184656642160e9ac032d0646f766058a5b':
  StringBlock_nativeCreate: Possible Leak
 2012-12-21 18:13:29 -08:00
Victoria Lease
5ddfa24776 am fc56015b: Merge "Possible leak in android_emoji_EmojiFactory_newInstance" 
* commit 'fc56015bd3d86e470fdf3ac8449776809124875e':
  Possible leak in android_emoji_EmojiFactory_newInstance
 2012-12-20 13:47:07 -08:00
You Kim
218a313bb0 StringBlock_nativeCreate: Possible Leak 
osb can be leaked when osb->getError() != NO_ERROR

Change-Id: Icbeb8eb3fb78849c043fe032cc8f7050da041042
 2012-12-21 06:19:38 +09:00
Victoria Lease
fc56015bd3 Merge "Possible leak in android_emoji_EmojiFactory_newInstance" 2012-12-20 12:09:48 -08:00
Glenn Kasten
2326be4fa9 am ba97ad2a: Merge "Leak in ToneGenerator_native_setup" 
* commit 'ba97ad2a6740d5d38326c0c2ce8d5a685fab30bf':
  Leak in ToneGenerator_native_setup
 2012-12-20 11:03:33 -08:00
Justin Koh
a90c92a1c9 am 86903699: Merge "Start RecognitionActivity with an upswipe gesture." into jb-mr1-aah-dev 
* commit '86903699692a0b3229062da2995d829629e64e7b':
  Start RecognitionActivity with an upswipe gesture.
 2012-12-19 11:46:34 -08:00
Justin Koh
8690369969 Merge "Start RecognitionActivity with an upswipe gesture." into jb-mr1-aah-dev 2012-12-19 11:42:26 -08:00
Glenn Kasten
ba97ad2a67 Merge "Leak in ToneGenerator_native_setup" 2012-12-19 08:47:20 -08:00
Jean-Baptiste Queru
48576911a2 Merge from AOSP staging branch 
Change-Id: Iad3df4845e6fae16c4ae6dbddcad0121d4775dcd
 2012-12-18 15:14:12 -08:00
Ben Pietrzak
05cb363bf3 Start RecognitionActivity with an upswipe gesture. 
Change-Id: I7dd91bef3eb551bb7617307cc9a4777226b5ded7
 2012-12-18 11:12:47 -08:00
Robert Ly
bfb69176db am d4f4d14a: am 5042b051: am e7c3fba7: Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev 
* commit 'd4f4d14a91492384c4553b82be27b5f135a41227':
  change onEnd() to withEndAction() in javadocs
 2012-12-17 15:39:34 -08:00
Robert Ly
d4f4d14a91 am 5042b051: am e7c3fba7: Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev 
* commit '5042b051b395f36d3c582202e9e78758934b79a6':
  change onEnd() to withEndAction() in javadocs
 2012-12-17 15:37:21 -08:00
Robert Ly
5042b051b3 am e7c3fba7: Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev 
* commit 'e7c3fba7929a1cb73bbe6ca84a5140febc09a62a':
  change onEnd() to withEndAction() in javadocs
 2012-12-17 15:35:26 -08:00
Robert Ly
8ee2a70f08 change onEnd() to withEndAction() in javadocs 
Change-Id: Ic9a04bf86d62249b47dc654052d58797dfc3990c
 2012-12-17 15:00:08 -08:00
Adam Powell
7979b58a7a Merge "Memory leak due to bad destroy sequence" 2012-12-17 14:39:56 -08:00
Sascha Prueter
8149820c2b am 25458528: am dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev 
* commit '25458528f07ef9f4710e669b74b76d687bbc7645':
  Handle "CODE_ALREADY_PRESENT" message from Settings app
 2012-12-17 10:47:56 -08:00
Sascha Prueter
25458528f0 am dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev 
* commit 'dd2ed93e4794dd8472593cdd21fb7e0056f11dbf':
  Handle "CODE_ALREADY_PRESENT" message from Settings app
 2012-12-17 10:46:04 -08:00
Pawit Pornkitprasan
35e4a7029e Toast: fix force close if called from system service 
If a toast is created from a system service, an application context
will not be available, use the service context instead.

Fixes
http://code.google.com/p/android/issues/detail?id=40058
http://code.google.com/p/android/issues/detail?id=40075

Change-Id: Ic643f4557fa04476819cd2c3ee640b735eeae429
 2012-12-17 18:04:17 +07:00
satok
6bad2f2fef Handle "CODE_ALREADY_PRESENT" message from Settings app 
Bug: 7725834
Change-Id: I85c35e73978d606edf9687e2de76c6ffc3c3ee2b
 2012-12-17 15:02:04 +09:00
Elliott Hughes
6647f1bd2b am c749261f: Merge "Fix DateUtils.formatElapsedTime." 
* commit 'c749261fea1010dfa2d1337bd210c81d13052540':
  Fix DateUtils.formatElapsedTime.
 2012-12-15 14:58:01 -08:00
Marco Nelissen
50c782190d am 01f42639: Merge "fix typo in docs" 
* commit '01f42639f21ec98feb5e5d458632a1a1005b17e8':
  fix typo in docs
 2012-12-15 14:57:51 -08:00
Elliott Hughes
898d8048b6 am 2eca1b53: Merge "Add return after NULL check in JetPlayer" 
* commit '2eca1b53ae905f5ddaebaff7156340efdf97cb84':
  Add return after NULL check in JetPlayer
 2012-12-15 14:57:46 -08:00
Elliott Hughes
c749261fea Merge "Fix DateUtils.formatElapsedTime." 2012-12-14 17:39:19 -08:00
zobject
686a805ef9 Fix NullpointException problem in onMenuItemSelected 
If both title and condensed title is null,
item.getTitleCondensed() could be return null value
in onMenuItemSelected. therefore need to check
whether retun value is null or not.

Change-Id: Ib08f52b949a794aa7bd6cc25414041e820f62969
 2012-12-15 08:23:26 +09:00
Elliott Hughes
2eda18485c Fix DateUtils.formatElapsedTime. 
More reuse of StringBuilders, less broken home-grown formatting code.

Long-term, we should hand this over to icu4c, but they're not ready yet.

Bug: http://code.google.com/p/android/issues/detail?id=41401
Bug: 7736688
Change-Id: Ib3c1e1aad05827df646aa18645cce19dffb7551f
 2012-12-14 14:29:47 -08:00
Baligh Uddin
435c03749a Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-12-14 11:57:45 -08:00
Baligh Uddin
4e7ec51472 am 0ec825ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '0ec825ed70dd8383b0248608aa7abe0e8ed81854':
  Import translations. DO NOT MERGE
 2012-12-14 11:55:37 -08:00
Baligh Uddin
0ec825ed70 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-12-14 11:52:52 -08:00