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

78764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Wilson
fc1f1d173e am 0ddb5d3b: am 9cb376e7: Merge "Change NPN to forbid empty lists of protocols." into jb-dev 
* commit '0ddb5d3b5d91ed0b891476e834de5ec4ffafece8':
  Change NPN to forbid empty lists of protocols.
 2012-05-21 12:40:41 -07:00
Jean-Michel Trivi
eafa73e4dc am 1644f0d9: am 0a95ce9f: Merge "Handle media button events during phone calls and when ringing" into jb-dev 
* commit '1644f0d9ee72cf37f0b92a7b5ef44bfac1421bab':
  Handle media button events during phone calls and when ringing
 2012-05-21 12:40:38 -07:00
Daniel Sandler
5678460218 am 94496d57: am cb5ed06a: Merge "Hide the expanded status bar view when not in use." into jb-dev 
* commit '94496d5741c739743033207255fc155d46a5bca8':
  Hide the expanded status bar view when not in use.
 2012-05-21 12:40:31 -07:00
Svetoslav Ganov
d47ddda1ce am 91408aae: am 308904dc: Merge "Refactor WebView accessibility code into a separate class." into jb-dev 
* commit '91408aae7ad61c2c38145ba1da235fffcb826544':
  Refactor WebView accessibility code into a separate class.
 2012-05-21 12:40:26 -07:00
Daniel Sandler
bb04b69e74 am 9fd61568: am a5d17288: Merge "New null (disconnected) RSSI for wifi and mobile." into jb-dev 
* commit '9fd615682948fb005f575de7d35e78a69227f01d':
  New null (disconnected) RSSI for wifi and mobile.
 2012-05-21 12:40:16 -07:00
Amith Yamasani
cd820f9ff1 am 00e5d8bb: am e43e08bb: Merge "Avoid launching dialogs twice from double-clicking a preference." into jb-dev 
* commit '00e5d8bbc9fd6f44b7bdc1d781d78271c96a9644':
  Avoid launching dialogs twice from double-clicking a preference.
 2012-05-21 12:40:12 -07:00
Marco Nelissen
87ba92fa39 am ec733f09: am d88404d0: Merge "Fix .pls playlist parsing" into jb-dev 
* commit 'ec733f094b48882b78ccf00b0ade5a46229c41c3':
  Fix .pls playlist parsing
 2012-05-21 12:40:08 -07:00
John Reck
a12712f836 am 5653f280: am 76c0c612: Merge "Don\'t send an ontouchmove until slop is exceeded" into jb-dev 
* commit '5653f28030ef9ed5d457216cec67e1082c6b7ec4':
  Don't send an ontouchmove until slop is exceeded
 2012-05-21 12:39:55 -07:00
George Mount
1b4aab6640 am 23542062: am 3c814072: Merge "Only clear the caret when in caret selection mode." into jb-dev 
* commit '2354206216f13ace061c5000f045db066f6e074d':
  Only clear the caret when in caret selection mode.
 2012-05-21 12:39:47 -07:00
George Mount
2a21049117 am 45240cb3: am 84c4b08b: Merge changes Ia5729aaf,I91584b7d into jb-dev 
* commit '45240cb33ac88c5839df2e9c7e55c18b0aa7b517':
  Remove selection highlight when replacing/deleting.
  Don't do character add/delete when there is a selection.
 2012-05-21 12:39:44 -07:00
Ben Murdoch
82a83da301 am d36bde24: am 93e3bf12: Merge "Fix up the WebCoreThreadWatchdog" into jb-dev 
* commit 'd36bde2494a8635bc633d4bbd02f82bbfb72b7db':
  Fix up the WebCoreThreadWatchdog
 2012-05-21 12:39:40 -07:00
Daniel Sandler
97ccf4a852 am 90497c18: Merge "Remotable view method for TextView.setTextSize(int, float)." into jb-dev 
* commit '90497c18f72cf3d7ea2fd611502d0da2c9c69879':
  Remotable view method for TextView.setTextSize(int, float).
 2012-05-21 12:14:05 -07:00
Daniel Sandler
90497c18f7 Merge "Remotable view method for TextView.setTextSize(int, float)." into jb-dev 2012-05-21 12:12:13 -07:00
Chris Wren
c92c84ec96 am 125a45ed: am 468a2ac6: Merge "Don\'t assume digest lines are GONE, we may be recycling them." into jb-dev 
* commit '125a45ed82ca2c7622eb18c17a0a8bb077fb0928':
  Don't assume digest lines are GONE, we may be recycling them.
 2012-05-21 11:52:49 -07:00
Daniel Sandler
51d65ae8d9 am d72953e8: am 614349d7: Merge "Status Bar: Include wifi/mobile state in touch exploration" into jb-dev 
* commit 'd72953e87bff49673e1a8787961de37e21b8c061':
  Status Bar: Include wifi/mobile state in touch exploration
 2012-05-21 11:52:46 -07:00
Brian Colonna
324d426374 am 29da3939: am 2b9eba55: Merge "Not calling startUi() if no longer bound" into jb-dev 
* commit '29da39393ed2bdb1f4aa526fa89c57e11d679e7f':
  Not calling startUi() if no longer bound
 2012-05-21 11:52:40 -07:00
Daniel Sandler
7264f71399 Remotable view method for TextView.setTextSize(int, float). 
The only remotable method on TextView is setTextSize(float)
which assumes "sp" dimensions, making it tricky to get exact
text sizes.

Bug: 6519374
Change-Id: I961bbdd607ca6786c0630ff1ce19186f54f6f31f
 2012-05-21 14:51:51 -04:00
Daniel Sandler
dce1b85ba2 am 93eb5126: am 6a160984: Merge changes I3b129e4b,I489718a8 into jb-dev 
* commit '93eb51268759f289b251ed287e671d42aae48e1a':
  Black out the status bar when the shade comes down.
  Punch up the date contrast.
 2012-05-21 11:51:51 -07:00
Jeff Brown
ac7b445d75 am c7e11cf3: am 40013655: Support long-press on media keys with screen off. 
* commit 'c7e11cf36e9f4a5a220875a4a88dcca273f54225':
  Support long-press on media keys with screen off.
 2012-05-21 11:51:44 -07:00
Romain Guy
602e3ad3b2 am 6e153128: am 1b283b4e: Merge "Fix TextureView OpenGL sample" into jb-dev 
* commit '6e1531281a273ab1914b2c8c423d92b36a8ce5a6':
  Fix TextureView OpenGL sample
 2012-05-21 11:51:35 -07:00
Philip Milne
464c4e9879 am bfa3d50b: Merge "Doc changes for GridLayout." into jb-dev 
* commit 'bfa3d50b49a93a7d02f93c9ac54a74c40c6f2046':
  Doc changes for GridLayout.
 2012-05-21 11:36:05 -07:00
Philip Milne
bfa3d50b49 Merge "Doc changes for GridLayout." into jb-dev 2012-05-21 11:33:21 -07:00
Jean-Michel Trivi
3c2711fc28 Type of search on headset key long press must depend on device state 
When the user long presses on the headset key, the type of search
 that will launched must depend on the state of the device. The
 following logic is implemented:
 - screen on and device unlocked: action is ACTION_WEB_SEARCH,
 - device locked or screen off: action is ACTION_VOICE_SEARCH_HANDS_FREE
    with EXTRA_SECURE set to true if the device is securely locked.

Bug 6518222

Change-Id: I318770346b8d83e44dfcd4154bcdb517ea7098b5
 2012-05-21 10:59:44 -07:00
Jeff Brown
1b9ba578f1 Disable debug logs. 
Change-Id: Icc7d389789885185f2ca9b609bad6096fe290106
 2012-05-21 10:54:18 -07:00
Romain Guy
169ff0199b am d7e4ae48: Merge "Update AsyncTask documentation" into jb-dev 
* commit 'd7e4ae48c576d5aaef75754b29a8b87c1f0d6427':
  Update AsyncTask documentation
 2012-05-21 10:49:24 -07:00
Romain Guy
d7e4ae48c5 Merge "Update AsyncTask documentation" into jb-dev 2012-05-21 10:47:10 -07:00
Philip Milne
b65408fc0f Doc changes for GridLayout. 
Add some javadoc to explain orientation property properly.

Change-Id: I1e2092f32fe2f524eda7d1c46c6daad571733c1f
 2012-05-21 10:46:56 -07:00
Romain Guy
2c1b8c744d Update AsyncTask documentation 
Change-Id: I678506309f027bb12d0c3f42436a60611aca5d8c
 2012-05-21 10:43:26 -07:00
John Wang
6e317b2f43 am 45131d0c: Merge "Only reset time from NITZ in zone fix." into jb-dev 
* commit '45131d0c3b9cb6927589396520eb40f33be406f0':
  Only reset time from NITZ in zone fix.
 2012-05-21 10:36:26 -07:00
John Wang
6841139cb5 am dabf4e41: Merge "Change "uk" to "gb" in COUNTRY_CODES." into jb-dev 
* commit 'dabf4e4149404c85ff221e80f371909ade2834f4':
  Change "uk" to "gb" in COUNTRY_CODES.
 2012-05-21 10:36:23 -07:00
John Wang
45131d0c3b Merge "Only reset time from NITZ in zone fix." into jb-dev 2012-05-21 10:33:08 -07:00
John Wang
dabf4e4149 Merge "Change "uk" to "gb" in COUNTRY_CODES." into jb-dev 2012-05-21 10:32:51 -07:00
Chris Wren
56a02e6e61 am 29bb6d92: Support more items in the Notification.InboxStyle, plus an overflow. 
* commit '29bb6d925bcaa562212b3fe41de249c3dfb64354':
  Support more items in the Notification.InboxStyle, plus an overflow.
 2012-05-21 10:19:26 -07:00
Michael Kolb
3fe0bca0c3 add flag to websearch intent 
Bug: 6372537

Change-Id: Ia3f8577ffdde2df5234016dd8d9ca83265b53e5e
 2012-05-21 09:40:17 -07:00
Chris Wren
29bb6d925b Support more items in the Notification.InboxStyle, plus an overflow. 
Bug: 6500113
Change-Id: I9f6b45ef0821c45000afa8a23ee51033b51df298
 2012-05-21 07:56:58 -07:00
George Mount
cc32b714ec Merge "Consider fixed layers when scrolling the edit box." 2012-05-21 07:18:35 -07:00
satok
5978c628cd am d7ba8143: Merge "Fix the issue on the inconsistent condition of InputMethodSubtype" into jb-dev 
* commit 'd7ba81437020b45f8f33fef729820078b1cd2547':
  Fix the issue on the inconsistent condition of InputMethodSubtype
 2012-05-21 02:57:31 -07:00
satok
d7ba814370 Merge "Fix the issue on the inconsistent condition of InputMethodSubtype" into jb-dev 2012-05-21 02:53:41 -07:00
satok
d81e950265 Fix the issue on the inconsistent condition of InputMethodSubtype 
Bug: 6510104
Change-Id: I67790e5f59d0d05340b74eca1029c60f381061b8
 2012-05-21 18:30:14 +09:00
Pannag Sanketi
2b8767837b am 850c2c36: Merge "Fixing the weird preview size w/ effects on camera" into jb-dev 
* commit '850c2c36de89ceb4c2c7c1cc73c2aed52b493fa5':
  Fixing the weird preview size w/ effects on camera
 2012-05-20 21:53:38 -07:00
satok
ee8ddd52ff am 5d4d23eb: Merge "Consolidate the initialization of InputMethodManagerService not to use resource values until system ready" into jb-dev 
* commit '5d4d23ebdf42a90207a86fc258a44e9540f356ab':
  Consolidate the initialization of InputMethodManagerService not to use resource values until system ready
 2012-05-20 21:53:36 -07:00
Jeff Brown
dd8e50f4b9 am cf39bdf3: Add support for switching between multiple keyboard layouts. 
* commit 'cf39bdf3dff5e29447f6ce734b76dc3490385e58':
  Add support for switching between multiple keyboard layouts.
 2012-05-20 21:53:34 -07:00
Jeff Brown
3ec5724d60 am 51f24302: Support toast cancellation. 
* commit '51f2430217a377bc2913862d98a97d0087914540':
  Support toast cancellation.
 2012-05-20 21:53:32 -07:00
Pannag Sanketi
850c2c36de Merge "Fixing the weird preview size w/ effects on camera" into jb-dev 2012-05-20 21:26:16 -07:00
satok
5d4d23ebdf Merge "Consolidate the initialization of InputMethodManagerService not to use resource values until system ready" into jb-dev 2012-05-20 19:59:50 -07:00
Jeff Brown
cf39bdf3df Add support for switching between multiple keyboard layouts. 
Also show a notification when an external keyboard is connected
and does not have a keyboard layout selected yet.

Bug: 6405203
Change-Id: Id0ac6d83b3b381f8a236b2244a04c9acb203db3c
 2012-05-20 14:56:22 -07:00
Jeff Brown
51f2430217 Support toast cancellation. 
Change-Id: Idd00b9c6e3049822e437afaf56351575a5c167df
 2012-05-20 12:09:37 -07:00
Raphael Moll
6c255a3a37 Merge "AAPT: support a new --ignore-assets flag." 
AAPT has a fixed built-in list of files and directories
to ignore when parsing resource files. Over the years we
always had developers requiring specific patterns.

Added a command-line option for it:
  aapt di --ignore-assets "foo*:*.blah"

If the env var ANDROID_AAPT_IGNORE is set, it is parsed
to find which file/directory patterns to ignore.

Otherwise a default is used that matches the current behavior.

SDK Bug: 5343 24067

(cherry-pick from AOSP 90897ed87bce639bf6bb2ccf15fbabb59b131bab)

Change-Id: Ia4caa2a8188c8c1df143f884e459b8182645995f
 2012-05-18 20:34:44 -07:00
Dianne Hackborn
72669b5f46 am 13a0271c: Merge "Add aapt support for generating proguard rules for onClick methods." into jb-dev 
* commit '13a0271cb81d497edbf93f3d6ecf4b9b8da4ee69':
  Add aapt support for generating proguard rules for onClick methods.
 2012-05-18 19:41:10 -07:00
Dianne Hackborn
13a0271cb8 Merge "Add aapt support for generating proguard rules for onClick methods." into jb-dev 2012-05-18 19:39:09 -07:00