Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,399 Commits 3 Branches 0 Tags
f7e47a003ada4b225dcafe722ab0de35a846b58a
Commit Graph

27900 Commits

Author SHA1 Message Date
Jim Miller
d9147aad5e am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1 
* commit '270826a8878b5470d48d93ca3d518ac93860870d':
  Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen
 2011-11-09 23:24:07 +00:00
Jim Miller
270826a887 Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1 2011-11-09 15:19:31 -08:00
George Mount
a2c9f2707b Merge "Set the initial scroll position for RTL." 2011-11-09 15:15:42 -08:00
satok
05f2470061 Respect user settings for spell checking language if explicitly set 
Bug: 5554116
Change-Id: I8c16d732af1fe713d30d97dfe829ff16653c7f34
 2011-11-10 07:54:52 +09:00
George Mount
e263bc1a36 Set the initial scroll position for RTL. 
Bug 5268793
 Webkit knows about the correct initial position for web pages.
 On initial show, scroll to the webkit position.

 External WebKit CL: I6a91b97f

Change-Id: I2537b84a30a26a79a8a0f23fe62b9ed757f9c5a4
 2011-11-09 14:43:55 -08:00
Jeff Sharkey
5cc8b1f0fd am 33e3710a: am 630a13bd: Merge "Bootstrap stats before registering listeners." into ics-mr1 
* commit '33e3710aafb68125f05ab30d61e324c894f0a3bb':
  Bootstrap stats before registering listeners.
 2011-11-09 21:51:40 +00:00
Jeff Sharkey
c592a57f3f am 489b4312: am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1 
* commit '489b431273500db81d35ed43440915187c238f92':
  Make operation counts monotonically increase.
 2011-11-09 21:51:38 +00:00
Dianne Hackborn
1284a49315 am 0141b727: am cd489c4c: Merge "Don\'t crash if there is no connectivity service." into ics-mr1 
* commit '0141b7275e4597e5944752d4f4ea3707c2b4f465':
  Don't crash if there is no connectivity service.
 2011-11-09 21:51:30 +00:00
Svetoslav Ganov
1002b62243 am cc03abe1: am 1bef480b: Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1 
* commit 'cc03abe1fc51a62e65f22944c3a4cba5dd3c34d3':
  NumberPicker incorectly enforcing minimal width and height.
 2011-11-09 21:51:28 +00:00
Dianne Hackborn
6238667682 am 3b2681ba: am 3af8b88d: Merge "Add drop box reports of low memory." into ics-mr1 
* commit '3b2681bad989013154f90c4b9c31f074af1f822c':
  Add drop box reports of low memory.
 2011-11-09 21:51:21 +00:00
Michael Kolb
35d17ec7c1 am 3a77503c: am a4293ba1: Merge "Remove flicker from WebTextView" into ics-mr1 
* commit '3a77503ca16253a702977a11406aec7a332837cb':
  Remove flicker from WebTextView
 2011-11-09 21:51:19 +00:00
Dave Santoro
941c6f7f71 am 8e2c5113: am b78ae752: Merge "Unhide social stream APIs for Contacts." into ics-mr1 
* commit '8e2c51137cdd1917d36c3a78ff6c1a42cc8ea402':
  Unhide social stream APIs for Contacts.
 2011-11-09 21:51:08 +00:00
Matthew Xie
ea57ede544 am 3a6f9ded: am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 
* commit '3a6f9ded543db6cb7a2842540a2b67b0356b21ae':
  Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
 2011-11-09 21:51:01 +00:00
Adam Cohen
dcf7cf4ca4 am 068b7f02: am 75b20380: Merge "Making default widget padding public API" into ics-mr1 
* commit '068b7f02a35e969c1607f8a35c422c93ee72c8a3':
  Making default widget padding public API
 2011-11-09 21:50:54 +00:00
Robert Greenwalt
75f9808e55 am 604019c8: Merge "Fix build." into ics-mr1 
* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
  Fix build.
 2011-11-09 19:34:50 +00:00
Adam Powell
c31c42abb6 am 8689afbd: Merge "Fix bug 5544103 - Spinner text doesn\'t look dimmed when disabled" into ics-mr1 
* commit '8689afbd63db3b1af6058709da843ea9d6433b21':
  Fix bug 5544103 - Spinner text doesn't look dimmed when disabled
 2011-11-09 19:34:47 +00:00
Danielle Millett
77c7b4ddeb am b9b08257: Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1 
* commit 'b9b08257370d244b4bccc4e243dda3c4daf4b0af':
  Showing a congratulations screen after choosing face unlock backup lock
 2011-11-09 19:34:44 +00:00
Jeff Brown
6e1c362a21 am e7de36e6: Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1 
* commit 'e7de36e605e0ccf4552c8ee1db40cb9af3227cf4':
  Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022
 2011-11-09 19:22:14 +00:00
Jeff Brown
e7de36e605 Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1 2011-11-09 11:20:24 -08:00
John Reck
22a073f073 am 36a7f2a9: Merge "Fix determining find on page overlap" into ics-mr1 
* commit '36a7f2a9adfa21ec31f00d496fef82e68931c860':
  Fix determining find on page overlap
 2011-11-09 19:00:49 +00:00
Gilles Debunne
4eddb9356a am 76bb11ca: Merge "Bug 5575396: close spell session on language change" into ics-mr1 
* commit '76bb11ca642556673249a6ef8b84ab2813deaa87':
  Bug 5575396: close spell session on language change
 2011-11-09 18:59:45 +00:00
Jeff Sharkey
ba83524338 am 630a13bd: Merge "Bootstrap stats before registering listeners." into ics-mr1 
* commit '630a13bdd88723599a7617ca4df20ab923e7ffbb':
  Bootstrap stats before registering listeners.
 2011-11-09 18:59:40 +00:00
Jeff Sharkey
3c865c0a51 am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1 
* commit '4c48d2ff6937e1e3a2fb93cc4cc29324b20542a5':
  Make operation counts monotonically increase.
 2011-11-09 18:59:38 +00:00
Dianne Hackborn
0126a4a7f2 am cd489c4c: Merge "Don\'t crash if there is no connectivity service." into ics-mr1 
* commit 'cd489c4ce59c134c384238cbb613ede34f28189c':
  Don't crash if there is no connectivity service.
 2011-11-09 18:59:19 +00:00
Svetoslav Ganov
f32985381c am 1bef480b: Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1 
* commit '1bef480b223f03d0fc866f08ca101a07ead89bc2':
  NumberPicker incorectly enforcing minimal width and height.
 2011-11-09 18:59:14 +00:00
Jason Simmons
f981686779 resolved conflicts for merge of 3af8b88d to ics-aah 
Change-Id: I2b68cd7c904e68a16565b7274560e7105c643c87
 2011-11-09 10:08:21 -08:00
Steve Block
d951473859 Merge "Clean up JavaDoc for WebView.addJavascriptInterface()" 2011-11-09 09:43:53 -08:00
John Reck
36a7f2a9ad Merge "Fix determining find on page overlap" into ics-mr1 2011-11-09 09:28:11 -08:00
Steve Block
4cd73c5bfd Clean up JavaDoc for WebView.addJavascriptInterface() 
Bug: 5461416
Change-Id: Ic83e0e4035f6230134e4f36938e53f106c468876
 2011-11-09 17:04:49 +00:00
Robert Greenwalt
c1b3cbe164 resolved conflicts for merge of ea54b760 to master 
Change-Id: Ifcdfd6ffd82db1293936a8a3b5715dd767fb43f8
 2011-11-09 09:03:59 -08:00
Michael Kolb
d8883f5129 am a4293ba1: Merge "Remove flicker from WebTextView" into ics-mr1 
* commit 'a4293ba1a0f1129d5879ae9eda45292ff357e20c':
  Remove flicker from WebTextView
 2011-11-09 14:37:36 +00:00
Dave Santoro
b7a262cdc1 am b78ae752: Merge "Unhide social stream APIs for Contacts." into ics-mr1 
* commit 'b78ae7524eecbca01a53994d6872202633c8341b':
  Unhide social stream APIs for Contacts.
 2011-11-09 14:37:19 +00:00
Matthew Xie
afb3fa6c96 am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 
* commit '48542eb39e55f2d0e2a79d43e696ffb2acb67b5c':
  Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
 2011-11-09 14:37:11 +00:00
Adam Cohen
87ce25a772 am 75b20380: Merge "Making default widget padding public API" into ics-mr1 
* commit '75b2038004f3338c68c9a0e89b29a31e10b237da':
  Making default widget padding public API
 2011-11-09 14:36:57 +00:00
Tom Taylor
81b10fd74e am 1366c756: Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1 
* commit '1366c756d28cdbb6c7c07959dfb4c93c81a9539d':
  Add new secure setting for controlling Messaging notifications
 2011-11-09 14:34:18 +00:00
Kristian Monsen
b69ce80383 Merge "Part of fix for bug 5584571 Add HTTP request header with app name" 2011-11-09 03:35:01 -08:00
Kristian Monsen
008c37d8f4 Part of fix for bug 5584571 Add HTTP request header with app name 
Need the context to get the package name, adding it method here
that can be called from JNI.

Change-Id: I530d81d9d922ea73a3f9d185618a5c4cfde0aca7
 2011-11-09 11:23:35 +00:00
Gilles Debunne
61ddbbae71 Visual glitches when starting extracted text 
Partially addresses Bug 5547923

In landscape, tapping on the text
1. starts extracted text mode
2. displays the cursor handle or the selection popup window.

As a result, some ghost effects and race conditions create an
unpleasing visual experience.

Fixed this by not doing 2. in case extracted mode will start.

The drawback of this quicl fix is that the user will have to
tap again to get the handle/suggestion. That can be fixed later
if needed.

Change-Id: I10e1d8399bb35e5b2cd5cba1295f7d29d051cae0
 2011-11-09 09:48:43 +01:00
Gilles Debunne
76bb11ca64 Merge "Bug 5575396: close spell session on language change" into ics-mr1 2011-11-09 00:26:46 -08:00
Jeff Sharkey
630a13bdd8 Merge "Bootstrap stats before registering listeners." into ics-mr1 2011-11-08 23:43:58 -08:00
Jeff Sharkey
4c48d2ff69 Merge "Make operation counts monotonically increase." into ics-mr1 2011-11-08 23:43:38 -08:00
Jeff Brown
0bde66a837 Throw TransactionTooLargeException when Binder transaction fails. 
Bug: 5578022

Previously, Binder transactions failed silently, which caused
problems because apps would carry on assuming that the operation
had succeeded.  Often, the apps would crash soon due to a violated
invariant, but sometimes they managed to do some damage first...

Change-Id: Ia9cc98b3b761a8160e7c4e87507860b5912c0451
 2011-11-08 20:42:11 -08:00
Jeff Brown
319369f32f Merge "Fix JavaDoc typos." 2011-11-08 20:41:09 -08:00
Jeff Brown
603f97f324 Fix JavaDoc typos. 
Change-Id: Ieabcd5b89c89440f425917319225735445324765
 2011-11-08 20:24:21 -08:00
Jeff Sharkey
3359aca765 Bootstrap stats before registering listeners. 
Also move ISE to handled NonMonotonicException.

Bug: 5570872
Change-Id: I793f349287ef5589185f117dfbec6f1fad73a661
 2011-11-08 18:24:12 -08:00
Dianne Hackborn
cd489c4ce5 Merge "Don't crash if there is no connectivity service." into ics-mr1 2011-11-08 17:58:26 -08:00
Jeff Sharkey
4abb1b8ef6 Make operation counts monotonically increase. 
Bug: 5585704
Change-Id: I5247a68acdb209a4ef0f5aac18944595c295e6ca
 2011-11-08 17:35:28 -08:00
Dianne Hackborn
d4d32c594f Don't crash if there is no connectivity service. 
Change-Id: I5f991896125fda22ff99b98a6aca244adbb17449
 2011-11-08 17:33:59 -08:00
Svetoslav Ganov
1bef480b22 Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1 2011-11-08 17:33:49 -08:00
Dianne Hackborn
3af8b88d03 Merge "Add drop box reports of low memory." into ics-mr1 2011-11-08 17:01:05 -08:00