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

21320 Commits

Author SHA1 Message Date
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
Daniel Sandler
adb15a5b08 am 3c07f7f0: am fd8f6f2f: Merge "Fix obsolete Honeycomb platlogo." into ics-mr0 
* commit '3c07f7f0d6702d16bb2a26026339ab053e1a37eb':
  Fix obsolete Honeycomb platlogo.
 2011-10-12 20:42:43 -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
Adam Powell
59d30bbc88 am 75c00531: am f2894659: Fix bug 5449931 - Wrong theme for icon menus 
* commit '75c00531ecd6c10bcb12c06f19a0d51467ddb525':
  Fix bug 5449931 - Wrong theme for icon menus
 2011-10-12 20:42:35 -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
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
Fred Quintana
0c65ba4cd9 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:52:09 -07:00
Jeff Brown
2b5b83bda8 Merge "Improve screenshot chord debouncing. Bug: 5011907" 2011-10-12 14:49:57 -07:00
Jeff Brown
905805ad7c 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 14:34:23 -07:00
RoboErik
dc8f43294a Merge "Fix immenent build breakage." 2011-10-12 13:45:12 -07:00
RoboErik
fced9521be Fix immenent build breakage. 
Change-Id: Iad7b68f1e16d4ba781fa45f467cb59c73a6ff26d
 2011-10-12 13:43:56 -07:00
RoboErik
3db295cd7e Merge "Add hidden API to prepare for increasing calendar support" 2011-10-12 13:29:34 -07:00
RoboErik
f8143c5d07 Add hidden API to prepare for increasing calendar support 
This adds hidden APIs for supporting settng allowed availabilities and
attendee types, adding the tentative availability and resource
attendee type, color indexes for calendars and events, and a colors
table.

b/5317399 b/5309787 b/5207781 b/5347210

Change-Id: I8dec4d0ebb0523b34bd420a0ab62bf5d0650996f
 2011-10-12 13:27:44 -07:00
Daniel Sandler
3c07f7f0d6 am fd8f6f2f: Merge "Fix obsolete Honeycomb platlogo." into ics-mr0 
* commit 'fd8f6f2f7557c414466f7634391821e59c1ce040':
  Fix obsolete Honeycomb platlogo.
 2011-10-12 13:12:37 -07:00
Daniel Sandler
fd8f6f2f75 Merge "Fix obsolete Honeycomb platlogo." into ics-mr0 2011-10-12 13:11:13 -07:00
Fabrice Di Meglio
cee057ed2d am 87228cd7: Merge "Fix bug #5446966 Changing Gravity on a TextView does not change how the text is aligned" into ics-mr0 
* commit '87228cd7bb9a39e2bb33a767d214c8d834f840df':
  Fix bug #5446966 Changing Gravity on a TextView does not change how the text is aligned
 2011-10-12 12:42:12 -07:00
Fabrice Di Meglio
87228cd7bb Merge "Fix bug #5446966 Changing Gravity on a TextView does not change how the text is aligned" into ics-mr0 2011-10-12 12:39:55 -07:00
Adam Powell
fe52c0f2f0 am cecf2021: am acf7d982: Merge "Fix bug 5434403 - invalidation problem with seek bars at edges" into ics-mr0 
* commit 'cecf20218923c91e1820bba033a85d32a9de11f2':
  Fix bug 5434403 - invalidation problem with seek bars at edges
 2011-10-12 12:38:21 -07:00
Svetoslav Ganov
da04419b64 am f42d34bd: Merge "Add AccessibilityRecord#getMaxScrollX and #getMaxScrollY to the pubic API" 
* commit 'f42d34bdd1934c52e6e588a15cd4c8bd0f66f832':
  Add AccessibilityRecord#getMaxScrollX and #getMaxScrollY to the pubic API
 2011-10-12 12:38:12 -07:00
Michael Kolb
2fb6245959 am 1eb08f0a: am f0f7a913: Merge "Support spellcheck attribute in WebTextView" into ics-mr0 
* commit '1eb08f0acb0220d5ad03579c566a00497b665816':
  Support spellcheck attribute in WebTextView
 2011-10-12 12:37:50 -07:00
Adam Powell
d42c029100 am b24f45d5: am 1a4c4334: Merge "Fix bug 5396097 - menu theme consistency" into ics-mr0 
* commit 'b24f45d542d2838c6f910e4fd57dc5bf738a1ffd':
  Fix bug 5396097 - menu theme consistency
 2011-10-12 12:37:47 -07:00
Jeff Brown
2b60484225 am 241fe477: am 58bf986c: Merge "Use ashmem for CursorWindows. Bug: 5332296" into ics-mr0 
* commit '241fe477edba539bcc58df4410c307d9540a4233':
  Use ashmem for CursorWindows. Bug: 5332296
 2011-10-12 12:37:46 -07:00
Romain Guy
3ef396bb0a am f751210b: Merge "Fix the build" 
* commit 'f751210b4b040458df789e217f168bccbb95117a':
  Fix the build
 2011-10-12 12:37:22 -07:00
Romain Guy
1f66e8bd4e am df61887f: Merge "Check whether an AsyncTask is created/executed on a looper thread." 
* commit 'df61887feb5348f1d30a2e86b13ae64c271c4acc':
  Check whether an AsyncTask is created/executed on a looper thread.
 2011-10-12 12:37:15 -07:00
Adam Powell
75c00531ec am f2894659: Fix bug 5449931 - Wrong theme for icon menus 
* commit 'f2894659e8df625783afcd3fa17462ab23d29145':
  Fix bug 5449931 - Wrong theme for icon menus
 2011-10-12 12:26:42 -07:00
Adam Powell
f2894659e8 Fix bug 5449931 - Wrong theme for icon menus 
IconMenuPresenter should always use its own theme for the system
inflater.

Change-Id: Iacadce37d62a60cdf6220d82f1178098ed92d51e
 2011-10-12 12:13:45 -07:00
Fabrice Di Meglio
9f51384720 Fix bug #5446966 Changing Gravity on a TextView does not change how the text is aligned 
- this was a regression introduced when dealing with getLayoutAlignment()

Change-Id: I9571a7976789b768c7cb41560d88b35d67ae3895
 2011-10-12 11:43:27 -07:00
Eino-Ville Talvala
ca2640b2ab am 0a273592: Merge "Add video stabilization control to Camera parameters." into ics-mr0 
* commit '0a2735928030229b3340074eb11c2423342fda93':
  Add video stabilization control to Camera parameters.
 2011-10-12 10:40:11 -07:00
Eino-Ville Talvala
0a27359280 Merge "Add video stabilization control to Camera parameters." into ics-mr0 2011-10-12 10:37:57 -07:00
Eino-Ville Talvala
037abb8bb0 Add video stabilization control to Camera parameters. 
Hardware video stabilization reduces camera shake in preview
and in recorded videos. It has no effect on still image capture.

Convenience accessor methods hidden for now.

Change-Id: Ie18450bff662b2ef98b85d19719beefc180975fc
 2011-10-12 10:34:10 -07:00
Steve Block
ca731c5c6b am c0c394ee: Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0 
* commit 'c0c394ee053c1b62da58247c431c20d5939c4ada':
  Modify BrowserFrame.requestClientCert() to take the host and port as a String
 2011-10-12 10:00:48 -07:00
Amith Yamasani
421648ed06 Merge "Backup owner info as part of settings backup. DO NOT MERGE." into ics-mr0 2011-10-12 09:59:11 -07:00
Steve Block
c0c394ee05 Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0 2011-10-12 09:58:25 -07:00
Gilles Debunne
b10d396f2e Merge "Bug 5385279: IOOB in createMisspelledSuggestionSpan" 2011-10-12 09:51:17 -07:00
Gilles Debunne
ba25c01335 Merge "Bug 5237623: word no longer underlined after replacement" 2011-10-12 09:50:45 -07:00
Amith Yamasani
aee2687e61 Backup owner info as part of settings backup. DO NOT MERGE. 
[Cherry pick from master]

Added these settings to the whitelist:
Settings.Secure.LOCK_SCREEN_OWNER_INFO_ENABLED
Settings.Secure.LOCK_SCREEN_OWNER_INFO

Bug: 5342797
Change-Id: I1bd4d04b5651b61919efd8c1b25c04acc5806f4a
 2011-10-12 09:46:43 -07:00
Amith Yamasani
50f9924322 Merge "Backup owner info as part of settings backup." 2011-10-12 09:45:22 -07:00
Daniel Sandler
5f839f8ee4 Fix obsolete Honeycomb platlogo. 
Bug: 5438131
Change-Id: I848bcc8e4d6cdd28c1ffaa08b7fcceb87242932a
 2011-10-12 10:48:05 -04:00
Steve Block
8eb83b96ac Modify BrowserFrame.requestClientCert() to take the host and port as a String 
Currently we get the host and port from Chromium as a std::string, convert to a
jbyte array to pass over JNI, then convert to String. It's simpler to convert
directly to jstring and to pass that over JNI.

Requires https://android-git.corp.google.com/g/141234
in external/webkit.

Bug: 5442710

Change-Id: I5480471a841c24481ef09d836a8b0c778251b119
 2011-10-12 09:51:22 +01:00
Adam Powell
4d9adfe6ae am 35af3639: Merge "Fix bug 5173029 - make fast scroller aware of scrolling containers" into ics-mr0 
* commit '35af3639a169b1b8e5f4d96579795e5480080b52':
  Fix bug 5173029 - make fast scroller aware of scrolling containers
 2011-10-11 19:33:29 -07:00