Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,605 Commits 3 Branches 0 Tags
35d5fb744dcbf17bbe468ea2b48be669c8225007
Commit Graph

14751 Commits

Author SHA1 Message Date
Romain Guy
571f76a24e am cff27e52: am c8219299: Merge "Remove unnecessary code." into honeycomb 
* commit 'cff27e523d68f72012bd908bac1a78cbb5b0a7e9':
  Remove unnecessary code.
 2011-01-20 11:41:18 -08:00
Romain Guy
cff27e523d am c8219299: Merge "Remove unnecessary code." into honeycomb 
* commit 'c8219299b0003793cee8049b96a3bf7530765eea':
  Remove unnecessary code.
 2011-01-20 11:39:18 -08:00
Romain Guy
c8219299b0 Merge "Remove unnecessary code." into honeycomb 2011-01-20 11:37:22 -08:00
Romain Guy
ff26a0c1c9 Remove unnecessary code. 
Change-Id: I83eba3406c26a4028af08b4d4c95ecd02803e75a
 2011-01-20 11:39:09 -08:00
Huahui Wu
3aae603e39 am baa647e3: am 292f39c1: Merge "b/3350774 Enforce clearing the flag mIsHandlingMultiTouch." into honeycomb 
* commit 'baa647e325a3ba1acaa463b8c3553de6547ff4f5':
  b/3350774 Enforce clearing the flag mIsHandlingMultiTouch.
 2011-01-20 11:16:31 -08:00
Huahui Wu
baa647e325 am 292f39c1: Merge "b/3350774 Enforce clearing the flag mIsHandlingMultiTouch." into honeycomb 
* commit '292f39c1201f2f08ac90d5562a7fd7070e9b32a0':
  b/3350774 Enforce clearing the flag mIsHandlingMultiTouch.
 2011-01-20 11:13:36 -08:00
Huahui Wu
292f39c120 Merge "b/3350774 Enforce clearing the flag mIsHandlingMultiTouch." into honeycomb 2011-01-20 11:08:33 -08:00
Svetoslav Ganov
f27e6d5d78 am f008667e: am 1ec1fdfc: Merge "API REVIEW: android.widget.NumberPicker.OnValueChangedListener" into honeycomb 
* commit 'f008667e6d6dc62f36b46c35ebe41b7592b3931c':
  API REVIEW: android.widget.NumberPicker.OnValueChangedListener
 2011-01-20 11:06:40 -08:00
Svetoslav Ganov
f008667e6d am 1ec1fdfc: Merge "API REVIEW: android.widget.NumberPicker.OnValueChangedListener" into honeycomb 
* commit '1ec1fdfce959069f3092c15d27efc1c2286dc15c':
  API REVIEW: android.widget.NumberPicker.OnValueChangedListener
 2011-01-20 11:04:27 -08:00
Romain Guy
e23cae2335 am 1eaac21e: am 68c56a51: Merge "Documentation fix." into honeycomb 
* commit '1eaac21e6f4056fd582a7e58fb9a553f37f7820a':
  Documentation fix.
 2011-01-20 11:02:25 -08:00
Svetoslav Ganov
1ec1fdfce9 Merge "API REVIEW: android.widget.NumberPicker.OnValueChangedListener" into honeycomb 2011-01-20 11:02:14 -08:00
Romain Guy
1eaac21e6f am 68c56a51: Merge "Documentation fix." into honeycomb 
* commit '68c56a51b32b5f5322c4f0f7dbba918712ad6473':
  Documentation fix.
 2011-01-20 11:00:19 -08:00
Romain Guy
482b34a6f8 Documentation fix. 
Activity's documentation wasn't clear on what would happen when
calling setContentView(View).

Change-Id: I37be6565ba897694460c80a39562346293faa8ea
 2011-01-20 10:59:28 -08:00
Romain Guy
68c56a51b3 Merge "Documentation fix." into honeycomb 2011-01-20 10:57:59 -08:00
Svetoslav Ganov
cedc446684 API REVIEW: android.widget.NumberPicker.OnValueChangedListener 
Change-Id: I1e739553ab6b99b2768e42cf379a0b155dced81a
 2011-01-20 10:41:14 -08:00
Svetoslav Ganov
2cf5f5a103 am 655f6e10: am 19484fac: Merge "Some touches on the NumberPicker UI." into honeycomb 
* commit '655f6e1026f1d6a4db9a4453ee25897fdd5a4006':
  Some touches on the NumberPicker UI.
 2011-01-20 10:12:37 -08:00
Svetoslav Ganov
655f6e1026 am 19484fac: Merge "Some touches on the NumberPicker UI." into honeycomb 
* commit '19484fac336ce1606a9f0b464d6bfc33ae0523e7':
  Some touches on the NumberPicker UI.
 2011-01-20 10:10:20 -08:00
Svetoslav Ganov
19484fac33 Merge "Some touches on the NumberPicker UI." into honeycomb 2011-01-20 10:08:39 -08:00
Gilles Debunne
353b4f10a6 am a04cfb9a: am 6b20dc43: Merge "Error popup no longer flickers in TextViews." into honeycomb 
* commit 'a04cfb9a023448f872691e773a08c0ff811ce20c':
  Error popup no longer flickers in TextViews.
 2011-01-20 09:57:16 -08:00
Gilles Debunne
a04cfb9a02 am 6b20dc43: Merge "Error popup no longer flickers in TextViews." into honeycomb 
* commit '6b20dc43a0b835254840746f1027945b5414654b':
  Error popup no longer flickers in TextViews.
 2011-01-20 09:55:32 -08:00
Gilles Debunne
6b20dc43a0 Merge "Error popup no longer flickers in TextViews." into honeycomb 2011-01-20 09:53:18 -08:00
Huahui Wu
bc7c148285 b/3350774 Enforce clearing the flag mIsHandlingMultiTouch. 
b/3350774 was fixed by https://android-git.corp.google.com/g/#change,91337
But there is small chance that the flag mIsHandlingMultiTouch is not cleared
correctly. This CL enforces to clear the flag.

Change-Id: I79ba6b401a7d7b3c772d3f123912343491551507
 2011-01-20 09:23:09 -08:00
Iain Merrick
5f1216cb98 am bf98190b: am 8192b417: Merge "Add BrowserFrame.setCertificate() method." into honeycomb 
* commit 'bf98190b4b49644fe3d2be688e33bebb59b3d3c9':
  Add BrowserFrame.setCertificate() method.
 2011-01-20 08:21:30 -08:00
Iain Merrick
bf98190b4b am 8192b417: Merge "Add BrowserFrame.setCertificate() method." into honeycomb 
* commit '8192b4179fd96629383c15f19f38edb22b674e99':
  Add BrowserFrame.setCertificate() method.
 2011-01-20 08:19:37 -08:00
Iain Merrick
8192b4179f Merge "Add BrowserFrame.setCertificate() method." into honeycomb 2011-01-20 08:17:15 -08:00
Ken Wakasa
f41e1af8c0 am 7fff9d8e: am 586f0513: Refine InputMethodInfo API 
* commit '7fff9d8e0489455363eb2d70111b7164adab46ff':
  Refine InputMethodInfo API
 2011-01-20 08:16:05 -08:00
Ken Wakasa
7fff9d8e04 am 586f0513: Refine InputMethodInfo API 
* commit '586f051375d8d7aeece05329921f9f66fc6164cb':
  Refine InputMethodInfo API
 2011-01-20 08:14:19 -08:00
Ken Wakasa
586f051375 Refine InputMethodInfo API 
bug: 3370297
Change-Id: I2a18f3bdbe2fccb22e22cdae0f75aec5c703ad6d
 2011-01-21 01:02:58 +09:00
Tadashi G. Takaoka
d738d87e13 am b1ba4367: am 317b2ea1: Merge "Add android.provider.Settings.EXTRA_INPUT_METHOD_ID" into honeycomb 
* commit 'b1ba4367b6ef046ec137345932318265f210a205':
  Add android.provider.Settings.EXTRA_INPUT_METHOD_ID
 2011-01-20 07:41:12 -08:00
Tadashi G. Takaoka
b1ba4367b6 am 317b2ea1: Merge "Add android.provider.Settings.EXTRA_INPUT_METHOD_ID" into honeycomb 
* commit '317b2ea16a9ba681ee185d5b7a0c385a1fdbe1d5':
  Add android.provider.Settings.EXTRA_INPUT_METHOD_ID
 2011-01-20 07:37:14 -08:00
Iain Merrick
b890e758ef Add BrowserFrame.setCertificate() method. 
This is needed for the Chrome HTTP stack to report SSL
certificates to WebView, in order to pass the CTS.

Change-Id: I0752a836ebaea21eae2084f037b18de4168f271f
 2011-01-20 15:33:41 +00:00
Tadashi G. Takaoka
317b2ea16a Merge "Add android.provider.Settings.EXTRA_INPUT_METHOD_ID" into honeycomb 2011-01-20 07:30:36 -08:00
Tadashi G. Takaoka
2548020c36 Add android.provider.Settings.EXTRA_INPUT_METHOD_ID 
Change-Id: Iecb7a9c265cafe96e7eec099341133da8e966f6f
 2011-01-21 00:15:29 +09:00
Kristian Monsen
28f37efe30 am 6e8831cf: am 7450a32b: Merge "Clear the files we copy over to the temp cache" into honeycomb 
* commit '6e8831cf2d7fd90ab124f58a9fc1919fac818887':
  Clear the files we copy over to the temp cache
 2011-01-20 06:40:08 -08:00
Kristian Monsen
6e8831cf2d am 7450a32b: Merge "Clear the files we copy over to the temp cache" into honeycomb 
* commit '7450a32bab8945738589d7b323953cdc80de111f':
  Clear the files we copy over to the temp cache
 2011-01-20 06:37:24 -08:00
Kristian Monsen
7450a32bab Merge "Clear the files we copy over to the temp cache" into honeycomb 2011-01-20 06:33:55 -08:00
Kristian Monsen
cedb3a7e58 Clear the files we copy over to the temp cache 
Fixes CTS tests

Change-Id: I3464ac90e58a9df21379a8da9d637f4f5ee69b85
 2011-01-20 14:31:20 +00:00
Tadashi G. Takaoka
2ee0635d46 am 6c51e1fc: am 90fcb2ad: Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb 
* commit '6c51e1fc9dd61bf5c269590305b3276f9e38c1ef':
  Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
 2011-01-20 05:21:18 -08:00
Tadashi G. Takaoka
6c51e1fc9d am 90fcb2ad: Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb 
* commit '90fcb2ad9378ee89f6795942c2b065a32bc83895':
  Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
 2011-01-20 05:19:35 -08:00
Tadashi G. Takaoka
90fcb2ad93 Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb 2011-01-20 05:17:51 -08:00
Tadashi G. Takaoka
f49688fa17 Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS 
Change-Id: I27c318777355991ae4ad72d0b2480e93c8c5044e
 2011-01-20 22:02:56 +09:00
Adam Cohen
8f700e9488 am 695976ab: am 0e2de6d7: Addressing API Review docs bugs: 
* commit '695976ab8e05adf59743937e08a17bc59af4bcd6':
  Addressing API Review docs bugs:
 2011-01-20 00:12:37 -08:00
Adam Cohen
695976ab8e am 0e2de6d7: Addressing API Review docs bugs: 
* commit '0e2de6d7187ef67ec00a2f2544450caa4a239c39':
  Addressing API Review docs bugs:
 2011-01-20 00:10:59 -08:00
Adam Cohen
0e2de6d718 Addressing API Review docs bugs: 
->Issue 3370313
->Issue 3370403
->Issue 3370328
->kthx, bye

Change-Id: I2d1962c27b3ba856a0b4632d335271300bab45eb
 2011-01-20 00:03:45 -08:00
Robert Ly
d9ce5c347e am e985c3a9: am 4c433225: Merge "Doc change: animation devguide topic" into honeycomb 
* commit 'e985c3a9bdb5e7cb3dd7c3ea0894396717e83955':
  Doc change: animation devguide topic
 2011-01-19 22:14:01 -08:00
Robert Ly
e985c3a9bd am 4c433225: Merge "Doc change: animation devguide topic" into honeycomb 
* commit '4c4332250d9e6d2cb746625cc232052561c4d450':
  Doc change: animation devguide topic
 2011-01-19 22:12:05 -08:00
Robert Ly
4c4332250d Merge "Doc change: animation devguide topic" into honeycomb 2011-01-19 22:09:47 -08:00
Romain Guy
91d61c6b31 am 821b82aa: am ed8f8dd8: Merge "Add rounded rects and circles support to OpenGLRenderer." into honeycomb 
* commit '821b82aaa1071b9ad69596ce0d0fae596ab1b171':
  Add rounded rects and circles support to OpenGLRenderer.
 2011-01-19 21:57:26 -08:00
Adam Powell
bc7c2ad3ea am db0d2634: am 818a7bbf: Merge "Better fix for bug 3112733" into honeycomb 
* commit 'db0d26348f5db934b1853fbc06b1ef46dd781e3a':
  Better fix for bug 3112733
 2011-01-19 21:57:22 -08:00
Romain Guy
821b82aaa1 am ed8f8dd8: Merge "Add rounded rects and circles support to OpenGLRenderer." into honeycomb 
* commit 'ed8f8dd8cf621d6046db7e083f8a36205ed55609':
  Add rounded rects and circles support to OpenGLRenderer.
 2011-01-19 21:54:34 -08:00