Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,922 Commits 3 Branches 0 Tags
b7dffa8a303e1a9f078f07d6157be7686a260607
Commit Graph

20956 Commits

Author SHA1 Message Date
Steven Ross
b7dffa8a30 am 97758c48: Merge "Moving fallback check code to Settings" 
* commit '97758c48cd7d09d119c7255388c77cf6e477e899':
  Moving fallback check code to Settings
 2011-09-30 13:10:04 -07:00
Steven Ross
3553c296c0 Moving fallback check code to Settings 
Change-Id: Ife924771d7bfedc6eccc6817172a699569560025
 2011-09-30 15:48:40 -04:00
Steven Ross
ae44f7e045 am d42825f4: Merge "calling back SetupFaceLock to clean up temporary gallery" 
* commit 'd42825f40e5a08a030a2f8f7ca2998e43d5d6f81':
  calling back SetupFaceLock to clean up temporary gallery
 2011-09-30 11:11:30 -07:00
Steven Ross
d42825f40e Merge "calling back SetupFaceLock to clean up temporary gallery" 2011-09-30 11:08:47 -07:00
Gilles Debunne
7831bb82c9 am eba3d923: Merge "Bug 5384675: Color in add to dictionary" 
* commit 'eba3d923415431ea8b301d4e77c8f2b7225fed30':
  Bug 5384675: Color in add to dictionary
 2011-09-30 10:59:52 -07:00
Gilles Debunne
54d51df4bb am 9fb46925: Merge "Bug 5384535: Underline for typo even if there are no suggestions" 
* commit '9fb46925d33643f830dfc2cf5a15601eb416143b':
  Bug 5384535: Underline for typo even if there are no suggestions
 2011-09-30 10:59:50 -07:00
Gilles Debunne
fc3c8da855 am 5b92a451: Merge "Bug 5254884: suggestions are no logner copied in the clipboard" 
* commit '5b92a451c0004b53e8c10537c5254c9e6d047d19':
  Bug 5254884: suggestions are no logner copied in the clipboard
 2011-09-30 10:59:49 -07:00
Gilles Debunne
4bcdc13c42 am 67ed574c: Merge "Bug 5250788: EditText gets slower has the entered text gets longer" 
* commit '67ed574cdb0a66c42a9827f7dbc54df98578271b':
  Bug 5250788: EditText gets slower has the entered text gets longer
 2011-09-30 10:59:47 -07:00
Gilles Debunne
eba3d92341 Merge "Bug 5384675: Color in add to dictionary" 2011-09-30 10:58:30 -07:00
Gilles Debunne
9fb46925d3 Merge "Bug 5384535: Underline for typo even if there are no suggestions" 2011-09-30 10:58:10 -07:00
Gilles Debunne
5b92a451c0 Merge "Bug 5254884: suggestions are no logner copied in the clipboard" 2011-09-30 10:58:01 -07:00
Gilles Debunne
67ed574cdb Merge "Bug 5250788: EditText gets slower has the entered text gets longer" 2011-09-30 10:57:51 -07:00
repo sync
b95dc6834e am 82afa6e6: Merge "Fix IPv6 on wifi" 
* commit '82afa6e61e6e8df57b71096a9f07eda956442fec':
  Fix IPv6 on wifi
 2011-09-30 09:59:52 -07:00
Mark Wagner
d588942d5c am ff1ea0dc: Merge "bugfix 5381702 MMS app puts temporary files on sdcard in wrong location" 
* commit 'ff1ea0dc5326aa2f1027a145763b05d6f5db0af2':
  bugfix 5381702 MMS app puts temporary files on sdcard in wrong location
 2011-09-30 09:57:48 -07:00
repo sync
82afa6e61e Merge "Fix IPv6 on wifi" 2011-09-30 09:57:36 -07:00
Mark Wagner
ff1ea0dc53 Merge "bugfix 5381702 MMS app puts temporary files on sdcard in wrong location" 2011-09-30 09:55:10 -07:00
Wei Huang
e731226997 am 51e6e3f2: Merge "Convert content type "image/jpg" to "image/jpeg"." 
* commit '51e6e3f2ef8e65f52688dffc272a7318778064ff':
  Convert content type "image/jpg" to "image/jpeg".
 2011-09-30 09:25:09 -07:00
Wei Huang
51e6e3f2ef Merge "Convert content type "image/jpg" to "image/jpeg"." 2011-09-30 09:23:03 -07:00
Kenny Root
6f85220da8 am 83a5926e: Merge "Add DUMP permission checks to services" 
* commit '83a5926ee349a3daf33cd8efd21e312fc0b1621e':
  Add DUMP permission checks to services
 2011-09-30 08:58:46 -07:00
Kenny Root
83a5926ee3 Merge "Add DUMP permission checks to services" 2011-09-30 08:57:43 -07:00
satok
d092245ed9 am 594cb476: Merge "Use user\'s settings for the spell check language instead of the system locale" 
* commit '594cb476547b38098018e80b5f70935ff60d9551':
  Use user's settings for the spell check language instead of the system locale
 2011-09-30 05:46:41 -07:00
Luca Zanolin
51d799fa02 am af43add3: Merge "The x and y position of the pop-up where not calculated correctly when the text view had internal scrolling." 
* commit 'af43add388cdc69d6d1006b874f970eb7dd3026e':
  The x and y position of the pop-up where not calculated correctly when the text view had internal scrolling.
 2011-09-30 05:46:39 -07:00
satok
594cb47654 Merge "Use user's settings for the spell check language instead of the system locale" 2011-09-30 01:52:40 -07:00
satok
70deff4c10 Use user's settings for the spell check language instead of the system locale 
Bug: 5390462
Change-Id: Ia2a3981cb93f451646debe5ee6b037313825cf9f
 2011-09-30 17:49:40 +09:00
Luca Zanolin
af43add388 Merge "The x and y position of the pop-up where not calculated correctly when the text view had internal scrolling." 2011-09-30 01:01:35 -07:00
Owen Lin
e29288629d Convert content type "image/jpg" to "image/jpeg". 
"image/jpg" is not a valid mimetype while "image/jpeg" is.
So change it to "image/jpeg" to increase the compatibillity with other
Apps in android. (e.g., Gallery)

bug: 5342561
Change-Id: Ia37433e35482492b7226c87a670bef3399ac4bb6
 2011-09-30 15:26:34 +08:00
Svetoslav Ganov
64b93fd9af am 2783b4fa: Merge "ActivityChooserView shows "see all" improperly." 
* commit '2783b4fa43568e480fd59e8beb7d762f9f696249':
  ActivityChooserView shows "see all" improperly.
 2011-09-29 17:57:10 -07:00
Fabrice Di Meglio
b18eed4532 am 46c78b4d: Merge "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)" 
* commit '46c78b4de14b18152db031d155006e6f45aa9eaa':
  Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)
 2011-09-29 17:55:05 -07:00
Svetoslav Ganov
2783b4fa43 Merge "ActivityChooserView shows "see all" improperly." 2011-09-29 17:54:22 -07:00
Fabrice Di Meglio
46c78b4de1 Merge "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)" 2011-09-29 17:53:09 -07:00
Romain Guy
c4204da3fc am 638f17c1: Merge "TextureView works best when it draws stuff. Bug #5391188" 
* commit '638f17c1b72ac226569dc08e2232adaf97349095':
  TextureView works best when it draws stuff. Bug #5391188
 2011-09-29 17:25:27 -07:00
Romain Guy
638f17c1b7 Merge "TextureView works best when it draws stuff. Bug #5391188" 2011-09-29 17:23:52 -07:00
Romain Guy
59c7f80dd2 TextureView works best when it draws stuff. 
Bug #5391188

Change-Id: I5e754881ccb08ff288ebd60de77282c9cbcf3f86
 2011-09-29 17:21:45 -07:00
repo sync
7960d9f888 Fix IPv6 on wifi 
Bug: 5388757
Change-Id: I3c8c776c26dad1daa9801d0455fde749c0206401
 2011-09-29 16:59:01 -07:00
Svetoslav Ganov
1c07e22c36 ActivityChooserView shows "see all" improperly. 
1. The cooser was presenting the "Show all" option if the number
   of available activities was more than the initial max count of activities
   to be shown. Since the show all option is added to the drop down
   the latter becomes effectively one longer than the initial max activity
   count which may make the drop down taller than client expectats. Also
   this leads to the case where if the activities are one more than the
   initial activity count pressing the show all button will just replace
   the show all item with the activity that did not fit - this is somehow
   annoying to the user.

bug:5379282

Change-Id: I2693214cb0b66edb2a3bdffc01ed29139341111c
 2011-09-29 16:51:04 -07:00
Amith Yamasani
201f090f82 am 966222ef: Merge "Handle the case of Preference lists that have header views inserted at the top." 
* commit '966222ef24a5d746e4fa84c8ea8bc2e718c78042':
  Handle the case of Preference lists that have header views inserted at the top.
 2011-09-29 16:50:49 -07:00
Amith Yamasani
966222ef24 Merge "Handle the case of Preference lists that have header views inserted at the top." 2011-09-29 16:48:55 -07:00
Romain Guy
996f5cab24 am 1e70aa94: Merge "Add system property to force hw acceleration." 
* commit '1e70aa94c1caa9bac3b412ae04c9f96ebd853b4f':
  Add system property to force hw acceleration.
 2011-09-29 16:40:57 -07:00
Romain Guy
1e70aa94c1 Merge "Add system property to force hw acceleration." 2011-09-29 16:39:16 -07:00
Romain Guy
9622e20486 Add system property to force hw acceleration. 
Change-Id: I538e641435f282b1af20866a8acd1f8d292734c4
 2011-09-29 16:38:24 -07:00
Mangesh Ghiware
a9a876349c am 293fe949: Merge "Force a WebView pictureset reset on screen rotation." 
* commit '293fe949207df0b7d1867ca3575d924b7ad5349b':
  Force a WebView pictureset reset on screen rotation.
 2011-09-29 16:00:09 -07:00
Mangesh Ghiware
293fe94920 Merge "Force a WebView pictureset reset on screen rotation." 2011-09-29 15:57:51 -07:00
Amith Yamasani
2d43d283fc Handle the case of Preference lists that have header views inserted at the top. 
Without this change, wrong Preference is returned when you select one.
Subtract the number of headers from the index before querying the adapter.
Needed for:
Bug: 5203189

Change-Id: Iba7277789ebbd7e3e9954931b1ea06c7e34f3c15
 2011-09-29 15:16:16 -07:00
Philip Milne
585de23521 am a15cb2cd: Merge "Fix for 5393156" 
* commit 'a15cb2cda76905789aa2b9d175d1e17307e4cde8':
  Fix for 5393156
 2011-09-29 15:02:40 -07:00
Philip Milne
a15cb2cda7 Merge "Fix for 5393156" 2011-09-29 15:01:27 -07:00
Philip Milne
4a145d7262 Fix for 5393156 
. Fix for the above.
. Make instances of Space invisible by default.
. Correctly accomodate parental constraints when row/col order is undefined.

This fix allows GridLayout to accomodate simple dependencies between
its axes. In the example given in bug 5393156, the presence of a
multi-line TextView means that GridLayout can only compute its height
after it has computed its width. This fix adds a second measurement pass
to GridLayout that passes infomation betwen the axes, using the GridLayout's
orientation property to indicate which axis should be examined first.

Change-Id: I90761c6fcfe8edc7ef6d9a89076fd5cda3adc0a4
 2011-09-29 14:48:44 -07:00
Mark Wagner
77e6a55f2f bugfix 5381702 MMS app puts temporary files on sdcard in wrong location 
move this code into the app

Change-Id: Ieca6c603ee1163524ddb855800ade5e5a8fff0e5
 2011-09-29 13:58:59 -07:00
Mangesh Ghiware
e8b05e858a Force a WebView pictureset reset on screen rotation. 
This fixes some stale content issues when rotating the screen.

Bug: 5357237
Bug: 5361852
Change-Id: I574dac15dbb1a35a8830377848f38ba2b766f095
 2011-09-29 13:41:34 -07:00
Steven Ross
329979c9e6 calling back SetupFaceLock to clean up temporary gallery 
This is done when the backup lock is complete or canceled.
If successful, the permanent gallery is replaced with the new one.
If canceled, the temporary gallery is deleted

Also deletes the main gallery if the lock type is changed from facial recognition

Change-Id: Id1ce804dec6b71b6410af53c050ad265c4cad5b0
 2011-09-29 16:00:59 -04:00
Fabrice Di Meglio
a130e5f59d Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown) 
- make DynamicLayout honor max lines
- make StaticLayout.generate() take maxLines as a parameter instead of using the field mMaximumVisibleLineCount

Change-Id: I9eafb1be4b8bb2aa881514955a6903f559cb6a1e
 2011-09-29 12:44:16 -07:00