Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,752 Commits 3 Branches 0 Tags
73fdc6c3f1ea1da372df840e3d287eddb828fa07
Commit Graph

19277 Commits

Author SHA1 Message Date
Chih-Chung Chang
73fdc6c3f1 am bdb38c14: Merge "Fix 5389072: NPE in MediaController.updateFloatingWindowLayout()." 
* commit 'bdb38c14b920474552c310001cd267f5a6ba81eb':
  Fix 5389072: NPE in MediaController.updateFloatingWindowLayout().
 2011-09-28 22:15:39 -07:00
Chih-Chung Chang
bdb38c14b9 Merge "Fix 5389072: NPE in MediaController.updateFloatingWindowLayout()." 2011-09-28 22:14:06 -07:00
Scott Main
008a34b980 am 43e7972f: Merge "docs: add some more info to Time javadocs" 
* commit '43e7972f4103127b8a74a2d52de0b36ba108bfa5':
  docs: add some more info to Time javadocs
 2011-09-28 21:50:45 -07:00
Chih-Chung Chang
02dd17da36 Fix 5389072: NPE in MediaController.updateFloatingWindowLayout(). 
There was another constructor which we didn't add the call to
initialize the layout.

Change-Id: I1519c9afd7d6333736fe19d256f55a2f4cdc60c3
 2011-09-29 12:49:04 +08:00
Scott Main
43e7972f41 Merge "docs: add some more info to Time javadocs" 2011-09-28 21:48:41 -07:00
Scott Main
31e04656e7 docs: add some more info to Time javadocs 
Change-Id: I3c5ca668acda734f8a0da0ffbbc1bfa77ed72c2a
 2011-09-28 21:36:51 -07:00
Svetoslav Ganov
1035cfc892 am a53d19dc: Merge "Revamping of the NumberPicker widget for improved usablility." 
* commit 'a53d19dc6dc25e00c898fc7e53276b864ea91936':
  Revamping of the NumberPicker widget for improved usablility.
 2011-09-28 19:45:42 -07:00
Svetoslav Ganov
a53d19dc6d Merge "Revamping of the NumberPicker widget for improved usablility." 2011-09-28 19:43:55 -07:00
Adam Powell
fd887c2725 am 28bbc825: Merge "Fully qualify javadoc links and make the tools happy" 
* commit '28bbc8254f1e1039290d6e549e43a34935102c32':
  Fully qualify javadoc links and make the tools happy
 2011-09-28 19:14:49 -07:00
Adam Powell
2fcbbd0363 Fully qualify javadoc links and make the tools happy 
Change-Id: I2ad839be71b550a2bcfb90f67627afdd10d3ae14
 2011-09-28 18:56:43 -07:00
Romain Guy
6b42e2cc73 am f678dd56: Merge "Don\'t build display lists for views with a layer." 
* commit 'f678dd56a71c5a57c1a695b207b43d6175ef21e7':
  Don't build display lists for views with a layer.
 2011-09-28 18:45:07 -07:00
Romain Guy
f678dd56a7 Merge "Don't build display lists for views with a layer." 2011-09-28 18:27:13 -07:00
Svetoslav Ganov
b80a3fcad1 Revamping of the NumberPicker widget for improved usablility. 
1. Now if the widget is not interacted with shows a smaller selector
   wheel with the increment and decrement arrows at the top and bottom
   respectively.

2. Tapping an arrow button now animates the widget to the new value. i.e.
   rotates the selector whell to the next value.

3. Fixed a bug that double tapping on the input shows the IME but then
   after pressing an arrow button the IME is not hidden.

4. Fixed a bug that was exposed via late changes in the framework or the
   graphics and was manifested of the selector wheel not having fading
   edges.

bug:5251980
bug:5383502

Change-Id: I4a089dc69b07a3b28a514017cddf786cb9f4af16
 2011-09-28 16:58:05 -07:00
Romain Guy
2a9fa89643 Don't build display lists for views with a layer. 
This could cause the draw() code of views to be invoked too often
or worse, called with the wrong canvas. For instance, a view backed
by a software layer could get its draw() method called to record a
display list. Using a software layer is the recommended way to use
drawing operations not supported in hardware. Since we would
sometimes call the draw() method with the hardware backend anyway,
the app could crash by executing an unsupported operation.

Change-Id: Ib5f9a3a4c6f3efff5e0162ecd73d2dffe06e30a6
 2011-09-28 16:50:02 -07:00
Fred Quintana
2b7802f3b1 am 40047fa1: am 272101b3: Merge "Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen." into ics-factoryrom 
* commit '40047fa14df169bece9c8d28bdbc515030d37383':
  Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen.
 2011-09-28 11:51:54 -07:00
Fred Quintana
40047fa14d am 272101b3: Merge "Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen." into ics-factoryrom 
* commit '272101b308c7eb0a4639bed0106830a8d6b0f2a1':
  Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen.
 2011-09-28 11:47:46 -07:00
Fred Quintana
272101b308 Merge "Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen." into ics-factoryrom 2011-09-28 11:45:52 -07:00
John Reck
ae082c9a2d am 55b039f1: Merge "Support for correctly scaling text selection handles" 
* commit '55b039f1b7ecb0439e095082e82c4d4fa2627921':
  Support for correctly scaling text selection handles
 2011-09-28 11:39:10 -07:00
John Reck
55b039f1b7 Merge "Support for correctly scaling text selection handles" 2011-09-28 11:11:57 -07:00
Steve Block
64da6a61b8 am 0a20d6a4: Merge "Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set" 
* commit '0a20d6a4c3474ec6582b7cd9db3d996563403a71':
  Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set
 2011-09-28 10:14:00 -07:00
Steve Block
0a20d6a4c3 Merge "Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set" 2011-09-28 10:11:55 -07:00
Chih-Chung Chang
da7b1231b5 am d83baa4e: Merge "Fix 5158468: Update floating window size when the anchor view size changes." 
* commit 'd83baa4ef3a2903214ea9b5c943db67751858e90':
  Fix 5158468: Update floating window size when the anchor view size changes.
 2011-09-28 04:49:16 -07:00
Chih-Chung Chang
d83baa4ef3 Merge "Fix 5158468: Update floating window size when the anchor view size changes." 2011-09-28 04:48:06 -07:00
Chih-Chung Chang
85d4ea6fe4 Fix 5158468: Update floating window size when the anchor view size changes. 
Originally when surfaceChanged() happens, we remove the old window and
create a new window. This causes flickering. Now we just update the window
layout according to the size of the anchor view.

Change-Id: Id741dac07872e473f2c9829b626c5c9568e7e22d
 2011-09-28 18:00:29 +08:00
Steve Block
38256165a2 am aae19fb9: Merge "Hook up WebView.clearSslPreferences() for the Chromium HTTP stack" 
* commit 'aae19fb90c9af3be4b0ef956940b7ef8afc37b0f':
  Hook up WebView.clearSslPreferences() for the Chromium HTTP stack
 2011-09-28 02:47:22 -07:00
Steve Block
aae19fb90c Merge "Hook up WebView.clearSslPreferences() for the Chromium HTTP stack" 2011-09-28 02:45:28 -07:00
Steve Block
a0d767c822 Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set 
This makes sure that the page's SSL certificate is cleared when the page load
starts.

Follows on from https://android-git.corp.google.com/g/#/c/138147.

Bug: 5287216
Change-Id: I40f74a72dc495c48d7167b7b70a845a8481feb85
 2011-09-28 10:44:11 +01:00
Kristian Monsen
d9151bf1cc Hook up WebView.clearSslPreferences() for the Chromium HTTP stack 
Note that this is an incomplete fix, as we do not clear the responses for
connections currently in use, as they maintain their own cache. See
http:/b/5324235.

Bug: 5287216
Change-Id: I18f6638efeff0bee1e7ffed606be1444d683bebd
 2011-09-28 10:44:11 +01:00
Mathew Inwood
e27d7e8630 am d0e8fb43: Merge "Document thrown IllegalArgumentException." 
* commit 'd0e8fb431ac9c1fcc2f5b0eba884d29fc57a4cf1':
  Document thrown IllegalArgumentException.
 2011-09-28 01:22:27 -07:00
Mathew Inwood
d0e8fb431a Merge "Document thrown IllegalArgumentException." 2011-09-28 01:20:04 -07:00
John Reck
1cfe8ddf62 Support for correctly scaling text selection handles 
Bug: 5367280

Change-Id: If32fdc9cd82d1a66bc96446a123c44d9edd9d340
 2011-09-27 20:14:39 -07:00
Romain Guy
217be64139 am 816b776b: Merge "Add a bit more doc to TextureView" 
* commit '816b776be13ae6c38b49ec982b317b9bae46a1b2':
  Add a bit more doc to TextureView
 2011-09-27 19:32:37 -07:00
Romain Guy
816b776be1 Merge "Add a bit more doc to TextureView" 2011-09-27 17:45:46 -07:00
Romain Guy
462785fa25 Add a bit more doc to TextureView 
Change-Id: Ib76c80d8f70ede1bb63db319bca1e93c489def4d
 2011-09-27 17:42:10 -07:00
Fred Quintana
9bbdd0bf50 Fix a bug in the account chooser where relaunching an in-progress flow 
results in a blank screen.

The fix involves making the first activity just call the account
type chooser to get the account type to add, rather than having
the account type chooser also kick off the AccountManager.addAccount()
request itself. Instead the first activity will get the type
back and then call AccountManager.addAccount()

Bug: 5346810
Change-Id: I4a0cf2370971b98f8ee0910f5401d97e999e546b
 2011-09-27 17:24:32 -07:00
Scott Main
a0e58a6db1 am 4c088485: Merge "docs: mix of BT and NFC javadoc updates Add Health profile to various discussions about profiles Add descriptions to NFC interfaces, tweak some desciptions, and fix some broken links" 
* commit '4c0884853855b1abac62c22426a803df4082fafa':
  docs: mix of BT and NFC javadoc updates Add Health profile to various discussions about profiles Add descriptions to NFC interfaces, tweak some desciptions, and fix some broken links
 2011-09-27 14:51:37 -07:00
Scott Main
4c08848538 Merge "docs: mix of BT and NFC javadoc updates Add Health profile to various discussions about profiles Add descriptions to NFC interfaces, tweak some desciptions, and fix some broken links" 2011-09-27 14:49:12 -07:00
Scott Main
2d68a6ba3c docs: mix of BT and NFC javadoc updates 
Add Health profile to various discussions about profiles
Add descriptions to NFC interfaces, tweak some desciptions, and fix some broken links

Change-Id: Ib89434c78a4ad60b4358dca9a6c335451d1c4125
 2011-09-27 14:04:48 -07:00
Alon Albert
98d35a217f am 553e5474: Merge "Add Detailed Sync Stats Section Also improve history formatting Here\'s a smaple of what it looks like:" 
* commit '553e54742043d9e7ee01d704390864ee554e8b09':
  Add Detailed Sync Stats Section Also improve history formatting Here's a smaple of what it looks like:
 2011-09-27 13:31:45 -07:00
Alon Albert
553e547420 Merge "Add Detailed Sync Stats Section Also improve history formatting Here's a smaple of what it looks like:" 2011-09-27 13:29:11 -07:00
Alon Albert
e0bde33e0d Add Detailed Sync Stats Section 
Also improve history formatting
Here's a smaple of what it looks like:

Detailed Statistics (Recent history):  20  40s
-------------------------------------------------------------------------------------
  com.android.contacts                                        : 9/45%      11/27%
    aagmtest1@gmail.com/com.google                            :   3/15%      4/11%
    aagmtest2@gmail.com/com.google                            :   3/15%      3/9%
    aalbert@google.com/com.google                             :   3/15%      2/6%
-------------------------------------------------------------------------------------
  gmail-ls                                                    : 6/30%      22/56%
-------------------------------------------------------------------------------------
  com.android.calendar                                        : 3/15%      5/14%
    aagmtest1@gmail.com/com.google                            :   1/5%       4/12%
    aagmtest2@gmail.com/com.google                            :   1/5%       0/0%
    aalbert@google.com/com.google                             :   1/5%       0/0%
-------------------------------------------------------------------------------------
  com.google.android.apps.plus.content.EsGooglePhotoProvider  : 2/10%      0/1%
    aagmtest1@gmail.com/com.google                            :   1/5%       0/1%
    aagmtest2@gmail.com/com.google                            :   1/5%       0/0%
-------------------------------------------------------------------------------------

Recent Sync History
  #1  : 2011-09-23 15:18:35   SERVER    0.8s  aalbert@google.com/com.google   gmail-ls
  #2  : 2011-09-23 15:17:56   SERVER    1.3s  00:38
  #3  : 2011-09-23 15:17:52   SERVER    4.6s  00:04
  #4  : 2011-09-23 15:17:45   SERVER    1.7s  00:06
  #5  : 2011-09-23 15:16:51    LOCAL    0.8s  aagmtest2@gmail.com/com.google  com.android.contacts
  #6  : 2011-09-23 15:16:51    LOCAL    0.7s  aalbert@google.com/com.google   com.android.contacts
  #7  : 2011-09-23 15:16:50    LOCAL    0.7s  aagmtest1@gmail.com/com.google  com.android.contacts
  #8  : 2011-09-23 15:15:35    LOCAL    0.7s  aalbert@google.com/com.google   com.android.contacts
  #9  : 2011-09-23 15:15:34    LOCAL    0.8s  aagmtest2@gmail.com/com.google  com.android.contacts
  #10 : 2011-09-23 15:15:33    LOCAL    1.9s  aagmtest1@gmail.com/com.google  com.android.contacts
  #11 : 2011-09-23 15:14:37    LOCAL    1.3s  aalbert@google.com/com.google   com.android.contacts
  #12 : 2011-09-23 15:14:35    LOCAL    2.0s  aagmtest1@gmail.com/com.google  com.android.contacts
  #13 : 2011-09-23 15:14:32    LOCAL    2.2s  aagmtest2@gmail.com/com.google  com.android.contacts
  #14 : 2011-09-23 15:13:41   SERVER    1.3s  aalbert@google.com/com.google   gmail-ls
  #15 : 2011-09-23 15:13:34    LOCAL    0.3s  aalbert@google.com/com.google   com.android.calendar
  #16 : 2011-09-23 15:13:34    LOCAL    0.4s  aagmtest2@gmail.com/com.google  com.android.calendar
  #17 : 2011-09-23 15:13:33   SERVER    0.1s  aagmtest2@gmail.com/com.google  com.google.android.apps.plus.content.EsGooglePhotoProvider
  #18 : 2011-09-23 15:13:33   SERVER    0.5s  aagmtest1@gmail.com/com.google  com.google.android.apps.plus.content.EsGooglePhotoProvider
  #19 : 2011-09-23 15:13:29    LOCAL    4.9s  aagmtest1@gmail.com/com.google  com.android.calendar
  #20 : 2011-09-23 15:13:28   SERVER   13.1s  aalbert@google.com/com.google   gmail-ls

Change-Id: Idc904e2e18a373b6d2d10af65b02683c11fd8d90
 2011-09-27 13:15:30 -07:00
Adam Powell
f84ef5a388 am 2b2adbdd: Merge "Improve docs in BaseAdapter." 
* commit '2b2adbdda04c96592026e84243cbb0f90a2021c9':
  Improve docs in BaseAdapter.
 2011-09-27 12:08:23 -07:00
Adam Powell
2b2adbdda0 Merge "Improve docs in BaseAdapter." 2011-09-27 12:06:33 -07:00
Adam Powell
f5d412a0c7 Improve docs in BaseAdapter. 
Change-Id: Idbe19f9b01132c28b4960515c23bd28e3729fd5d
 2011-09-27 11:32:59 -07:00
Steve Block
2ae6f76f94 am a3b06ff9: Merge changes If97c4d76,I1cd975b1 
* commit 'a3b06ff933132f149be18035f4f8e14ba6355b07':
  Always update the WebView's SSL certificate, regardless of whether a WebViewClient has been set
  Remove superfluous synchronized modifier on SslCertLookupTable.getInstance()
 2011-09-27 10:54:48 -07:00
Steve Block
a3b06ff933 Merge changes If97c4d76,I1cd975b1 
* changes:
  Always update the WebView's SSL certificate, regardless of whether a WebViewClient has been set
  Remove superfluous synchronized modifier on SslCertLookupTable.getInstance()
 2011-09-27 10:52:50 -07:00
Teng-Hui Zhu
19c66c6471 am 8d48b75b: Merge "Double check the permission before setting the Wake Lock" 
* commit '8d48b75b0cdc14bdec445074e8406a2cc5ea0924':
  Double check the permission before setting the Wake Lock
 2011-09-27 09:08:50 -07:00
Teng-Hui Zhu
8d48b75b0c Merge "Double check the permission before setting the Wake Lock" 2011-09-27 09:07:13 -07:00
Steve Block
9a0cd15eec Always update the WebView's SSL certificate, regardless of whether a WebViewClient has been set 
This looks like a copy-paste error from other CallbackProxy methods which call
back to the WebViewClient or WebChromeClient, rather than the WebView.

Also remove '@hide' annotations. These are superfluous as the class is not
public.

Bug: 5287216
Change-Id: If97c4d769cf82563b9c182ba09fc742fbb7e08e9
 2011-09-27 16:42:51 +01:00
Steve Block
200ff0a7b1 Remove superfluous synchronized modifier on SslCertLookupTable.getInstance() 
Also fixes style in SslCertLookupTable and WebViewcore.reportSslCertError().

Bug: 5287216
Change-Id: I1cd975b1c8cecf1ca1dad0643be8ab62f7a950bc
 2011-09-27 16:42:45 +01:00