Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,674 Commits 3 Branches 0 Tags
7754e537de1860dfffd4dc84f07f4e8b83072a53
Commit Graph

25225 Commits

Author SHA1 Message Date
Daniel Sandler
eb818188aa am 97ccf4a8: am 90497c18: Merge "Remotable view method for TextView.setTextSize(int, float)." into jb-dev 
* commit '97ccf4a8528ff101bc1aed5dbe9798e2fbefa7cd':
  Remotable view method for TextView.setTextSize(int, float).
 2012-05-21 14:32:12 -07:00
Philip Milne
c5f1296d3f am 464c4e98: am bfa3d50b: Merge "Doc changes for GridLayout." into jb-dev 
* commit '464c4e987998c4335ad837bd165243e50c6ea5f0':
  Doc changes for GridLayout.
 2012-05-21 14:31:58 -07:00
Romain Guy
a6f041ac6d am 169ff019: am d7e4ae48: Merge "Update AsyncTask documentation" into jb-dev 
* commit '169ff0199b50085a970db347f0616eb2a1f46f82':
  Update AsyncTask documentation
 2012-05-21 14:31:51 -07:00
Chris Wren
085eb02de2 am 56a02e6e: am 29bb6d92: Support more items in the Notification.InboxStyle, plus an overflow. 
* commit '56a02e6e61f7ae437f06b095e8c4310edcb5e9ab':
  Support more items in the Notification.InboxStyle, plus an overflow.
 2012-05-21 14:31:30 -07:00
Jeff Brown
534e6488bc am dd8e50f4: am cf39bdf3: Add support for switching between multiple keyboard layouts. 
* commit 'dd8e50f4b96578acd402ff4b199ca1649adf25fd':
  Add support for switching between multiple keyboard layouts.
 2012-05-21 14:29:33 -07:00
Jeff Brown
60ff93e432 am 3ec5724d: am 51f24302: Support toast cancellation. 
* commit '3ec5724d60e29ecb032cc4c9dc5d82924d5eee93':
  Support toast cancellation.
 2012-05-21 14:29:30 -07:00
Dianne Hackborn
b1b0058346 am 72669b5f: am 13a0271c: Merge "Add aapt support for generating proguard rules for onClick methods." into jb-dev 
* commit '72669b5f4663937b09d33f9d951f0b86a03fa98b':
  Add aapt support for generating proguard rules for onClick methods.
 2012-05-21 14:29:14 -07:00
Romain Guy
bd3217591d am 86ed8bfa: am 52fcdd01: Merge "Fix documentation" into jb-dev 
* commit '86ed8bfa5e9f5ed92570db7bc2011074464f86eb':
  Fix documentation
 2012-05-21 14:27:54 -07:00
Romain Guy
fc0c048ef4 am c301e78c: am 9579bf82: Merge "Gallery, we need to talk..." into jb-dev 
* commit 'c301e78c78188803137e2b9abfa27cd0f1ffaff5':
  Gallery, we need to talk...
 2012-05-21 14:27:40 -07:00
Romain Guy
68373bf484 am 1b61dc2e: am 43a760ba: Merge "Don\'t crash on Surface.unlockAndPost() but log & try again Bug #6482593" into jb-dev 
* commit '1b61dc2eb7f738bb49142db14a7d339e2fd90545':
  Don't crash on Surface.unlockAndPost() but log & try again Bug #6482593
 2012-05-21 14:12:53 -07:00
Dianne Hackborn
bd8e6f9d1c am c5fe4737: am fb5c3dba: Fix issue #6440173: MenuItem.setIcon(Drawable) scaling incorrectly... 
* commit 'c5fe47376c905e946eafbabdb78db4c128d3d71b':
  Fix issue #6440173: MenuItem.setIcon(Drawable) scaling incorrectly...
 2012-05-21 14:12:48 -07:00
Dianne Hackborn
5d9bb86367 am 9beee6ad: am d51ac09f: Merge "Fix activity resolver, issues #6519130 and #6507239" into jb-dev 
* commit '9beee6ad206541f351faad5cf30b9d0216f07d22':
  Fix activity resolver, issues #6519130 and #6507239
 2012-05-21 14:12:39 -07:00
Jeff Sharkey
dc7643d84c am 40bd46ae: am 9cb660fa: Merge "Guard against apps breaking CHOOSER contract." into jb-dev 
* commit '40bd46aefde45a216ff73f8c40497a50eccdb1e0':
  Guard against apps breaking CHOOSER contract.
 2012-05-21 14:12:33 -07:00
Dianne Hackborn
891a844646 am bcb7f04a: am e312c61f: Merge "Improve fitSystemWindows() documentation." into jb-dev 
* commit 'bcb7f04a7ca05a606d1b293dbe975f1710135be7':
  Improve fitSystemWindows() documentation.
 2012-05-21 14:12:30 -07:00
Jeff Sharkey
577a2e055c am 17bee29b: am 787c9ec5: Merge "Transition from DEV network stats to XT." into jb-dev 
* commit '17bee29b1fb0c8caa90860d8b98a69e616530b44':
  Transition from DEV network stats to XT.
 2012-05-21 14:12:22 -07:00
Matthew Xie
5b99700ade am fbeb8230: am dabb19fc: Merge "Increase the setup-sdp delay to cover for all the devices." into jb-dev 
* commit 'fbeb823031de2e62e11ce680b2fa5238f2e125cd':
  Increase the setup-sdp delay to cover for all the devices.
 2012-05-21 12:44:29 -07:00
John Reck
85712e6180 am 1f00a987: am 88b756cd: Merge "Don\'t show the touch highlight for double taps" into jb-dev 
* commit '1f00a987ac693a81cbd3739b903e981465451305':
  Don't show the touch highlight for double taps
 2012-05-21 12:44:09 -07:00
Romain Guy
cc1508d0dc am 09528f96: am c8c4ced8: Merge "Call invalidate() immediately when a frame is available" into jb-dev 
* commit '09528f96f4bc5e1d7acb9c00011d232182fb93b2':
  Call invalidate() immediately when a frame is available
 2012-05-21 12:43:55 -07:00
Dianne Hackborn
bad4c4bf71 am ccf4e2f7: am abe39277: Merge "Fix issue #6515427: Add android.hardware.television and fix..." into jb-dev 
* commit 'ccf4e2f71b65ace6d55c1e8513dd60b1123805da':
  Fix issue #6515427: Add android.hardware.television and fix...
 2012-05-21 12:43:35 -07:00
Jake Hamby
914994b0ab am cd9f8ea3: am 665935c1: Merge "Enable SMS short code patterns to be updated from secure settings." into jb-dev 
* commit 'cd9f8ea3beb104ba706eb315b661d1823b00fa36':
  Enable SMS short code patterns to be updated from secure settings.
 2012-05-21 12:43:28 -07:00
Svetoslav Ganov
128f15e2ca am 65e8ecf3: am a1daf827: Merge "Fix paragraph iterator." into jb-dev 
* commit '65e8ecf37b5aadf267eb5ff40b53b871f7be32d8':
  Fix paragraph iterator.
 2012-05-21 12:43:22 -07:00
Charles Chen
828328489e am a48374db: am c6015df1: Merge "Add actions to non-JavaScript accessibility handler." into jb-dev 
* commit 'a48374db17a04f12a60e9363721769dbfff01e65':
  Add actions to non-JavaScript accessibility handler.
 2012-05-21 12:43:08 -07:00
Charles Chen
2e19d34137 am 4d39ba26: am 9a9a041c: Merge "Add movement actions to JS accessibility." into jb-dev 
* commit '4d39ba269c890e2746f439ac52d91704744c25f3':
  Add movement actions to JS accessibility.
 2012-05-21 12:43:05 -07:00
John Reck
0bbce0e8fb am ce619a96: am 3d6f7ead: Merge "Tweak show/hide of touch highlight" into jb-dev 
* commit 'ce619a9675bcb2278bf9a078fb44bb4b1d728dd3':
  Tweak show/hide of touch highlight
 2012-05-21 12:43:02 -07:00
Kenny Root
32b513850e am 8101eb7a: am ae9d040f: Merge "Wait for ASECs to be scanned before proceeding" into jb-dev 
* commit '8101eb7a74d1a65aebd33c58742fc461dcb4518f':
  Wait for ASECs to be scanned before proceeding
 2012-05-21 12:43:00 -07:00
Jeff Brown
5f36ba718a am 90ab4341: am dc9445ba: Merge "Add support for grouping keyboard layouts by collection." into jb-dev 
* commit '90ab4341cf492bf80bbb90dfd6c614c65dc3c591':
  Add support for grouping keyboard layouts by collection.
 2012-05-21 12:42:53 -07:00
Jean-Michel Trivi
33cc232f74 am e215af22: am c79a9eac: Merge "New action and extra in RecognizerIntent for "hands free" voice search" into jb-dev 
* commit 'e215af22bfbb1f1322be07f43f03183daca21e93':
  New action and extra in RecognizerIntent for "hands free" voice search
 2012-05-21 12:42:46 -07:00
Martijn Coenen
390d4b3c62 am 47e5794b: am d42ad1da: Merge "NFC API documentation." into jb-dev 
* commit '47e5794baa1518ed0236176d965843dfbbb851eb':
  NFC API documentation.
 2012-05-21 12:42:22 -07:00
George Mount
314fcc396f am aa5f8581: am ea1603de: Merge "Update the IME with selection and composing region changes." into jb-dev 
* commit 'aa5f858176c903e94fa8ce07f5777d4935ef3a4e':
  Update the IME with selection and composing region changes.
 2012-05-21 12:42:17 -07:00
George Mount
8d47082d8f am e0df34f6: am bb8549db: Merge "Sync the selection cursor when adjusting caret handle." into jb-dev 
* commit 'e0df34f60374ce94b409b4360504fc7d2680db53':
  Sync the selection cursor when adjusting caret handle.
 2012-05-21 12:42:13 -07:00
Craig Mautner
92302af1ee am a978d9bf: am d51a68b3: Merge "Eliminate deferred surface destruction." into jb-dev 
* commit 'a978d9bfefa8f7cb1591a1789effa955d902a9cf':
  Eliminate deferred surface destruction.
 2012-05-21 12:41:26 -07:00
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
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
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
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
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
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
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
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
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
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
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