Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,910 Commits 3 Branches 0 Tags
b8e543dc5c6359da23337f20059581ce79c134bc
Commit Graph

19704 Commits

Author SHA1 Message Date
Bart Sears
b8e543dc5c am 0272df85: am bcfe4152: Merge "Improve JavaDoc for WebView.loadData()" into ics-mr0 
* commit '0272df85061304683a1fa9aa5825ba8dbf102841':
  Improve JavaDoc for WebView.loadData()
 2011-10-13 16:29:51 -07:00
Bart Sears
0272df8506 am bcfe4152: Merge "Improve JavaDoc for WebView.loadData()" into ics-mr0 
* commit 'bcfe41529b7bd9f572a2eff31375dc9fdf35b518':
  Improve JavaDoc for WebView.loadData()
 2011-10-13 16:27:16 -07:00
Steve Block
33f962b22e Improve JavaDoc for WebView.loadData() 
Make clear that the charset specified in the mediatype portion of a data URL
overrides that specified in the HTML or XML document itself.

Bug: 5418915
Change-Id: Iff7305b6ac9e656d0fb7ed1b2ffe6fd0e21be49b
 2011-10-13 15:32:13 -07:00
Gilles Debunne
2d307279ce am cbdd2457: Merge "Bug 5428541: Check that span is still in text before deleting" 
* commit 'cbdd245793fe5dc42d4573c20d0a43ad95d06d53':
  Bug 5428541: Check that span is still in text before deleting
 2011-10-13 14:25:20 -07:00
Gilles Debunne
cbdd245793 Merge "Bug 5428541: Check that span is still in text before deleting" 2011-10-13 14:23:37 -07:00
Christopher Tate
fc5800432d am 28e9046e: Merge "Require device encryption password to perform adb backup/restore" 
* commit '28e9046ed41a04562c34d37cad690aeebec36001':
  Require device encryption password to perform adb backup/restore
 2011-10-13 14:12:11 -07:00
Adam Powell
9e7b260550 am 9e45b78c: am aa79a5d5: Merge "Fix bug 5455676 - seek bars without thumbs" into ics-mr0 
* commit '9e45b78c4ec5531a01fb43afc088f5c67880343d':
  Fix bug 5455676 - seek bars without thumbs
 2011-10-13 14:08:53 -07:00
Daniel Sandler
849a99c197 am 8c05abf1: am dba93565: Break apart DISABLE_HOME and DISABLE_RECENT. 
* commit '8c05abf15743af7cccceae14c33e590a30a7cacc':
  Break apart DISABLE_HOME and DISABLE_RECENT.
 2011-10-13 14:08:29 -07:00
Christopher Tate
28e9046ed4 Merge "Require device encryption password to perform adb backup/restore" 2011-10-13 14:06:22 -07:00
Adam Powell
9e45b78c4e am aa79a5d5: Merge "Fix bug 5455676 - seek bars without thumbs" into ics-mr0 
* commit 'aa79a5d5a3b06b5b4e40a1ab0ccc6697627b1a8d':
  Fix bug 5455676 - seek bars without thumbs
 2011-10-13 13:12:42 -07:00
Adam Powell
aa79a5d5a3 Merge "Fix bug 5455676 - seek bars without thumbs" into ics-mr0 2011-10-13 13:10:14 -07:00
Daniel Sandler
8c05abf157 am dba93565: Break apart DISABLE_HOME and DISABLE_RECENT. 
* commit 'dba935659024a9ca83cb6bd3f1a9970e277f7658':
  Break apart DISABLE_HOME and DISABLE_RECENT.
 2011-10-13 12:38:00 -07:00
Christopher Tate
32418be49e Require device encryption password to perform adb backup/restore 
This supersedes any backup-password that the user might supply.  Per
design, the device encryption password is also always used to encrypt
the backup archive.

The CL introduces two new strings, used for prompting the user for
their device encryption password rather than their settings-defined
"backup password" when confirming a full backup or restore operation.

Bug 5382487

Change-Id: I0b03881b45437c944eaf636b6209278e1bba7a9f
 2011-10-13 12:29:32 -07:00
Daniel Sandler
dba9356590 Break apart DISABLE_HOME and DISABLE_RECENT. 
Additionally, start using setSystemUiVisibility() where
possible in the keyguard to allow activities and dialogs to
re-enable some of the navigation keys (notably: home but not
recents).

Finally, stop disabling MENU for activities atop the keyguard.

Bug: 5380495 // no home in driveabout, clock
Bug: 5396134 // able to show home/recent in keyguard
Change-Id: I04eb224554ee8cff79476b85148c4cda75bb0b62
 2011-10-13 15:28:10 -04:00
Adam Powell
2c5b8cc71b Fix bug 5455676 - seek bars without thumbs 
Change-Id: I9a4257b91a89cceeca7d5acf9358a8254446c784
 2011-10-13 11:44:38 -07:00
Fred Quintana
2984971db3 Merge "reworked the flow in the account chooser - resilient to the chooser activity being killed due to memory pressure - back now goes back to the main chooser screen rather than canceling it completely" into ics-mr0 2011-10-13 11:41:19 -07:00
Ben Murdoch
7c2ab75412 am 64f93d4f: Merge "Don\'t redraw when not scrolling, even if finger is held down." 
* commit '64f93d4f91df8830d3d6cd4490ac2f157a7f0325':
  Don't redraw when not scrolling, even if finger is held down.
 2011-10-13 10:19:17 -07:00
Ben Murdoch
64f93d4f91 Merge "Don't redraw when not scrolling, even if finger is held down." 2011-10-13 10:17:57 -07:00
Mangesh Ghiware
8b31746395 am df3975c5: am a6708c6a: Merge "Add setting for configuring zoom level on double-tap." into ics-mr0 
* commit 'df3975c5aee17cc365b854e616d8831b45809db0':
  Add setting for configuring zoom level on double-tap.
 2011-10-13 09:21:39 -07:00
Mangesh Ghiware
df3975c5ae am a6708c6a: Merge "Add setting for configuring zoom level on double-tap." into ics-mr0 
* commit 'a6708c6a462d2a30e51e7ded2559a4054cb651fc':
  Add setting for configuring zoom level on double-tap.
 2011-10-13 09:19:20 -07:00
Mangesh Ghiware
a6708c6a46 Merge "Add setting for configuring zoom level on double-tap." into ics-mr0 2011-10-13 09:17:10 -07:00
Ben Murdoch
fd8d3dede2 Don't redraw when not scrolling, even if finger is held down. 
Signal the native side that we are not scrolling when a drag is
held motionless to stop screen updates.

Additionally, in the case that a drag is being held motionless,
send a timed message to keep the scroll bars on screen otherwise
they fade in and out, again causing repaints that shouldn't be
necessary.

Bug: 5440335
Change-Id: I94db0323879885fa48924b41d29e8af03e3b5e7f
 2011-10-13 13:23:29 +01:00
Wu-cheng Li
cb1192f03a am 7a3ba4d7: am 514a6cfb: Merge "Improve camera javadoc and fix some errors." into ics-mr0 
* commit '7a3ba4d732d5ce394aab9783e4099b2e71f1903f':
  Improve camera javadoc and fix some errors.
 2011-10-12 23:38:35 -07:00
Wu-cheng Li
7a3ba4d732 am 514a6cfb: Merge "Improve camera javadoc and fix some errors." into ics-mr0 
* commit '514a6cfb7f7085b266f457155ff63373d2dff8ee':
  Improve camera javadoc and fix some errors.
 2011-10-12 23:36:14 -07:00
Daniel Lehmann
0b0a184669 am 5247fb38: am cc21cc01: Merge "Allow clearing out the source bounds" into ics-mr0 
* commit '5247fb38be85efda56ff062585912a229872749b':
  Allow clearing out the source bounds
 2011-10-12 21:11:43 -07:00
Dianne Hackborn
91c3f2a0b3 am 2c4d954e: am f4b40de6: Merge "Fix issue #5445966: WindowManager reporting -long on prime when it shouldn\'t be." into ics-mr0 
* commit '2c4d954ece25324dee2b5f4dc08bd8fb3f5e3dfb':
  Fix issue #5445966: WindowManager reporting -long on prime when it shouldn't be.
 2011-10-12 21:11:36 -07:00
Wu-cheng Li
53b30912d3 Improve camera javadoc and fix some errors. 
bug:5169599
Change-Id: Ic2205770753ff462135f884fee0a888ca8ec832d
 2011-10-13 12:04:05 +08:00
Fred Quintana
84789d7333 am 8257e9e8: Merge "reworked the flow in the account chooser - resilient to the chooser activity being killed due to memory pressure - back now goes back to the main chooser screen rather than canceling it completely" 
* commit '8257e9e851a229b61aed31cc5727288208b94a2f':
  reworked the flow in the account chooser  - resilient to the chooser activity being killed due to memory pressure  - back now goes back to the main chooser screen rather than canceling    it completely
 2011-10-12 20:43:18 -07:00
Jeff Brown
8324d388a8 am 2b5b83bd: Merge "Improve screenshot chord debouncing. Bug: 5011907" 
* commit '2b5b83bda80253a6ff0925ae65da636ed2856def':
  Improve screenshot chord debouncing. Bug: 5011907
 2011-10-12 20:43:15 -07:00
RoboErik
0b868c81c6 am dc8f4329: Merge "Fix immenent build breakage." 
* commit 'dc8f43294ab1da58f78ac516b372c1a698a01ecf':
  Fix immenent build breakage.
 2011-10-12 20:42:52 -07:00
RoboErik
6850097167 am 3db295cd: Merge "Add hidden API to prepare for increasing calendar support" 
* commit '3db295cd7ec6b6c6ab96ebcb4922d6dc168a1833':
  Add hidden API to prepare for increasing calendar support
 2011-10-12 20:42:48 -07:00
Fabrice Di Meglio
63be1fd1ed am cee057ed: am 87228cd7: Merge "Fix bug #5446966 Changing Gravity on a TextView does not change how the text is aligned" into ics-mr0 
* commit 'cee057ed2d5443d901484238a5212c2d3cc5c994':
  Fix bug #5446966 Changing Gravity on a TextView does not change how the text is aligned
 2011-10-12 20:42:37 -07:00
Eino-Ville Talvala
e8d7d03d59 am ca2640b2: am 0a273592: Merge "Add video stabilization control to Camera parameters." into ics-mr0 
* commit 'ca2640b2ab4136eefe138baf07dcfcbaea86da17':
  Add video stabilization control to Camera parameters.
 2011-10-12 20:01:08 -07:00
Steve Block
a36314e477 am ca731c5c: am c0c394ee: Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0 
* commit 'ca731c5c6beb031383e661d1f09730ba1877f457':
  Modify BrowserFrame.requestClientCert() to take the host and port as a String
 2011-10-12 19:38:41 -07:00
Gilles Debunne
90c6bef4ab am b10d396f: Merge "Bug 5385279: IOOB in createMisspelledSuggestionSpan" 
* commit 'b10d396f2e1d0329013f5376bd486621bd177bc8':
  Bug 5385279: IOOB in createMisspelledSuggestionSpan
 2011-10-12 19:38:39 -07:00
Gilles Debunne
8166d28a37 am ba25c013: Merge "Bug 5237623: word no longer underlined after replacement" 
* commit 'ba25c01335232b701232ff2157379b5828a47e52':
  Bug 5237623: word no longer underlined after replacement
 2011-10-12 19:38:37 -07:00
Amith Yamasani
6b88493ec7 am 50f99243: Merge "Backup owner info as part of settings backup." 
* commit '50f9924322fe4c434fc732da5e0d3e3c5875d686':
  Backup owner info as part of settings backup.
 2011-10-12 19:38:33 -07:00
Adam Powell
4a792378dc am 4d9adfe6: am 35af3639: Merge "Fix bug 5173029 - make fast scroller aware of scrolling containers" into ics-mr0 
* commit '4d9adfe6ae87c4bc8766c7d8e526e4c8ef1cd7d6':
  Fix bug 5173029 - make fast scroller aware of scrolling containers
 2011-10-12 19:38:28 -07:00
Romain Guy
f2314133bd am 0bbd8d82: Revert "Check whether an AsyncTask is created/executed on a looper thread." 
* commit '0bbd8d8273c1dde9e0504f67bd8eb159bef2406a':
  Revert "Check whether an AsyncTask is created/executed on a looper thread."
 2011-10-12 19:38:25 -07:00
Romain Guy
d7b6df5b1b am 5e7f2d0b: Revert "Fix the build" 
* commit '5e7f2d0b227df38f6dbc2313ac8b5c9f225c135e':
  Revert "Fix the build"
 2011-10-12 19:38:23 -07:00
Daniel Lehmann
5247fb38be am cc21cc01: Merge "Allow clearing out the source bounds" into ics-mr0 
* commit 'cc21cc017ba02338a78eca00af6a1a0d3f7ce5bf':
  Allow clearing out the source bounds
 2011-10-12 18:18:08 -07:00
Daniel Lehmann
cc21cc017b Merge "Allow clearing out the source bounds" into ics-mr0 2011-10-12 18:16:15 -07:00
Dianne Hackborn
2c4d954ece am f4b40de6: Merge "Fix issue #5445966: WindowManager reporting -long on prime when it shouldn\'t be." into ics-mr0 
* commit 'f4b40de684b3574475205542f22b2d49a75f31eb':
  Fix issue #5445966: WindowManager reporting -long on prime when it shouldn't be.
 2011-10-12 17:06:27 -07:00
Dianne Hackborn
f4b40de684 Merge "Fix issue #5445966: WindowManager reporting -long on prime when it shouldn't be." into ics-mr0 2011-10-12 17:01:18 -07:00
Daniel Lehmann
a5b58df097 Allow clearing out the source bounds 
Change-Id: Id49f4a3ac397cf17c5704d298b6a9a376f6a5c23
 2011-10-12 16:24:22 -07:00
Mangesh Ghiware
edb528ef52 Add setting for configuring zoom level on double-tap. 
In overview mode, text wrap is done at reading level scale. If user
changes double-tap zoom in overview mode, reflow text at the new scale.
In any other mode, a double-tap will take user to overview mode, at
which point, the text will be reflowed at the updated reading level
scale.

Bug: 5312461
Change-Id: I29be34a32246019101a9a875e1758e22b5af2bd3
 2011-10-12 15:24:29 -07:00
Dianne Hackborn
36991744a2 Fix issue #5445966: WindowManager reporting -long on prime when it shouldn't be. 
The window manager now uses the app screen dimensions to compute
the various configuration properties, as it should.

This means that prime is official a "not long" device.  Poor prime.
It probably feels inadequate now.

Because it is.

Oh and all that other stuff?  Debugging logs.  Turned off.  And
why the heck not, debugging logs are great.

Change-Id: Iaaf8ef270d986d34fd046d699ef4c0ecea1981fc
 2011-10-12 15:17:11 -07:00
Jeff Brown
d5bb82d18c DO NOT MERGE. Improve screenshot chord debouncing. 
Bug: 5011907

Introduce a 150ms delay in handling volume down keys
while waiting to see if a power key will follow.

Don't trigger the screenshot chord if both volume up and
volume down are pressed together.

Don't trigger the long-press power menu if volume keys are
also pressed.

Require the user to press both keys in the chord within
the debounce time and continue long-pressing them in order
to trigger the screenshot action.

Change-Id: I248968d37b73c09d6d08e7f62667c443eba32da0
 2011-10-12 15:05:59 -07:00
Fred Quintana
e9095bd737 reworked the flow in the account chooser 
- resilient to the chooser activity being killed due to memory pressure
 - back now goes back to the main chooser screen rather than canceling
   it completely

Bug: 5358896
Bug: 5381201
Bug: 5387749

Change-Id: I10e76013b2cceffc37ea891746533d6a08f279b7
 2011-10-12 14:54:57 -07:00
Fred Quintana
8257e9e851 Merge "reworked the flow in the account chooser - resilient to the chooser activity being killed due to memory pressure - back now goes back to the main chooser screen rather than canceling it completely" 2011-10-12 14:53:34 -07:00