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

51316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
9a4285474c am b1817383: am d3924fe9: Merge "Data Connection: Use Alarm for all delayed data retries." into honeycomb-LTE 
* commit 'b1817383050986413805fbbf2c1cc5c03417574d':
  Data Connection: Use Alarm for all delayed data retries.
 2011-05-24 08:42:05 -07:00
Shimeng (Simon) Wang
5b0724d6cf am f55a00b1: am de60ce66: am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer. 
* commit 'f55a00b1b86c58d78a4c2812d00e1b61d03f520a':
  Simplify browser pause/resume logic to avoid stuck timer.
 2011-05-24 08:41:37 -07:00
James Dong
2646219aaa resolved conflicts for merge of d5762583 to master 
Change-Id: Icba2bcdbc9f967288a65c930b198405fd8566abd
 2011-05-24 08:04:45 -07:00
Xavier Ducrohet
9dd85837e3 am 46e802e9: (-s ours) am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge. 
* commit '46e802e9c12befcd477e59437c5de3f0889aef4e':
  Merge e57aa434 from honeycomb-mr1. do not merge.
 2011-05-24 02:57:37 -07:00
Xavier Ducrohet
1ff04d8e56 am ea182704: (-s ours) am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread 
* commit 'ea182704b60551a9bd7760aa9d206ca7a7e407b8':
  Merge 05b7b69c from honeycomb-mr1. do not merge.
 2011-05-24 02:57:31 -07:00
Xavier Ducrohet
690a9bb8ad am 162dd490: (-s ours) am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread 
* commit '162dd490cd0b502c717db59300b3fd902f76710a':
  Merge 2fae858d from Honeycomb-mr1. do not merge.
 2011-05-24 02:57:11 -07:00
Kazuhiro Ondo
3dbc571e62 am 6056e326: am f96a6150: Data reconnection issue after airplane mode 
* commit '6056e3268a0aa114ad99e3e6ddaebe0ebfa6035e':
  Data reconnection issue after airplane mode
 2011-05-24 02:56:15 -07:00
Kazuhiro Ondo
eb1fbf7a45 am 8e1f6ece: am 4c88be65: GSM DCT: Update poll stats to support multi-links 
* commit '8e1f6eceb3fbdb478e83f14d021a77ee339ffb2e':
  GSM DCT: Update poll stats to support multi-links
 2011-05-24 02:56:08 -07:00
Wink Saville
cb3fad5cbe am 7abbf93c: am 15cd6ec2: Tear down connection with unwanted linkproperty change 
* commit '7abbf93c854cd7d272183b674373e989a05da6dd':
  Tear down connection with unwanted linkproperty change
 2011-05-24 02:38:17 -07:00
Wink Saville
d24c1dfe2b am f7bc0e28: am 16e8d22b: Fix build. 
* commit 'f7bc0e28bf66c20ef233a161cd1d50a009013ab0':
  Fix build.
 2011-05-24 00:39:54 -07:00
Irfan Sheriff
c2ff0e7031 am 9a737639: Merge "Clear network id when invalid" into honeycomb-LTE 
* commit '9a7376396ccd272d4be429373e06ae64fe096380':
  Clear network id when invalid
 2011-05-23 22:33:33 -07:00
Irfan Sheriff
9a7376396c Merge "Clear network id when invalid" into honeycomb-LTE 2011-05-23 22:30:33 -07:00
Wink Saville
2879343291 Fix build. 
A merge accidentally included a line that was deleted.

Change-Id: Id383b1d8808f1c4b12d3ad1372270601f92f5989
 2011-05-23 21:56:11 -07:00
Wink Saville
595881ee5e am f8d70b14: am 5f353de9: Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE 
* commit 'f8d70b14e4285d17d83cc4853f50b44d6a55fbc7':
  Notify RIL that PDP reset is triggered due to data stall
 2011-05-23 20:49:05 -07:00
John Wang
5ea7a29387 am b7a13791: am 393eb0d0: Merge "Add UI to handle SIM swap." into honeycomb-LTE 
* commit 'b7a13791a12eef57434b84a97609d98e03e17009':
  Add UI to handle SIM swap.
 2011-05-23 20:48:57 -07:00
Jim Miller
a0bb3acba1 am 59a3319f: am 67cd389d: am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2 
* commit '59a3319ffce100d671145b5bfee7450038b250bf':
  Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
 2011-05-23 20:48:36 -07:00
Tadashi G. Takaoka
23186b88bd Merge "Add new imeFullscreenBackground for Theme.InputMethod.Holo" 2011-05-23 19:00:01 -07:00
Gilles Debunne
9511b41e05 Made getOffsetForPosition public in TextView. 
Bug 4443839

Change-Id: I3e5d6f0fe3a45b068166f682daf3c4163903306e
 2011-05-23 18:48:26 -07:00
Jeffrey Tinker
c41a17de2b am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 
* commit '6e5cdca12bdbc26dd4d4eb1b1d986783b13601aa':
  Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
 2011-05-23 18:47:17 -07:00
Jeff Sharkey
348a48fc70 Merge "Observe screen on/off events in NetworkPolicy." 2011-05-23 18:47:11 -07:00
Mike Lockwood
859443f2a4 am c0d9834a: am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2 
* commit 'c0d9834a1c6dd8d9cd0b7fe9b50495578c104405':
  GPS: Change NTP polling interval from 4 to 24 hours
 2011-05-23 18:45:17 -07:00
Jeff Sharkey
a462079303 Observe screen on/off events in NetworkPolicy. 
The POLICY_REJECT_BACKGROUND policy requires that network traffic be
blocked when a UID goes into the background.  Even if the UID has an
activity in the foreground, it's considered "background" if the screen
is turned off.

This changes watches for SCREEN_ON/OFF broadcasts, and rule generation
now observes screen state.  It also introduces an observer pattern so
that ActivityManager doesn't directly know about NetworkPolicy, and
moves the service management into SystemServer.

Change-Id: Ie7a84929d3ca60ae4578d47e19d5a8da10fd8d58
 2011-05-23 18:39:56 -07:00
Mathias Agopian
8c777edea2 Merge "fix x86 build" 2011-05-23 18:39:40 -07:00
Jeff Sharkey
442fa21e98 Merge "APIs to profile network usage for current UID." 2011-05-23 18:38:04 -07:00
Tadashi G. Takaoka
75d27bc52e Add new imeFullscreenBackground for Theme.InputMethod.Holo 
This change also removes unnecessary background from ExtractEditText

Bug: 4431328
Change-Id: I1b35ddd388fe11cac9b7f9dd3f990b6c4d889185
 2011-05-24 10:27:43 +09:00
Wink Saville
9ddcdd98d9 am 0ba62525: am 2b534e77: Merge "Fix broken data retry" into honeycomb-LTE 
* commit '0ba625259e8c4af3df2c7823fc1d18b42d760a44':
  Fix broken data retry
 2011-05-23 18:25:52 -07:00
Gilles Debunne
3bca69b09f TextView uses floats for touch event positions. 
This is the type returned by event.getX/Y methods. Conversion
to ints is only performed when needed. Low performance impact
since there is only a minimal amount of computations on these
values.

Change-Id: I53a56efe5e3a1a96911adc25fedaab7f40f1ba8e
 2011-05-23 18:20:26 -07:00
Jeffrey Tinker
6e5cdca12b am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 
* commit 'ef89cc14957ab631346564801841190346632ac9':
  Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
 2011-05-23 18:15:47 -07:00
Jeffrey Tinker
ef89cc1495 Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 2011-05-23 18:10:10 -07:00
Mike Lockwood
c0d9834a1c am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2 
* commit '5d78e0b8ea548da3fa88ae2190a9334297b992b6':
  GPS: Change NTP polling interval from 4 to 24 hours
 2011-05-23 18:04:44 -07:00
Mike Lockwood
5d78e0b8ea Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2 2011-05-23 18:01:50 -07:00
Mike Lockwood
4c12606852 GPS: Change NTP polling interval from 4 to 24 hours 
4 hours is excessive, and we want to save bandwidth on the NTP servers

Change-Id: Ic5ac4f4a8e62167206f3f620ea51635a2ea771d6
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-23 20:57:43 -04:00
Mathias Agopian
f56a960105 fix x86 build 
Change-Id: I03cfbfeaeb8b13842248856b14b4a23711036e10
 2011-05-23 17:48:36 -07:00
Adam Powell
7d372b49e2 am 7dfdb914: am f483ed90: am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2 
* commit '7dfdb914206eafbf2aa4533e9b6a50428a5d0d3d':
  Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
 2011-05-23 17:18:54 -07:00
Wink Saville
ed5af6d93b am 61a5ab57: am f89ea7a5: Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE 
* commit '61a5ab57b8a11d134ed3cfcab24a23d26ea4ddf0':
  Change getLteOnCdmaModeStatic to dynamically determine its result.
 2011-05-23 17:18:29 -07:00
Gilles Debunne
f3a135bfba Added a new flag in TextView to disable Suggestions. 
This is needed for specific TextEdit (such as AutoCompleteTextField)
which do not want to display the "No suggestions available" message.

Bug 4443830

Change-Id: Ic228b56bacfdf2765e70eb24952ab087556c1f93
 2011-05-23 17:15:20 -07:00
Amith Yamasani
fcdbcf9174 am 5b00912e: am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2 
* commit '5b00912e5844591a846e8ba3c4710d2daaa8069a':
  DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
 2011-05-23 17:12:00 -07:00
Mike Lockwood
49b9449b66 am d8d84708: am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 
* commit 'd8d8470825a637843d45a3b436e80a3b85f1dd11':
  MountService: Add StorageVolume as extra in storage related broadcasts.
 2011-05-23 17:09:30 -07:00
Amith Yamasani
5b00912e58 am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2 
* commit '51652f5674e266d62607324255517d41d225d9be':
  DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
 2011-05-23 17:08:48 -07:00
Mike Lockwood
d8d8470825 am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 
* commit '988b6648b0138fe1294228e17164b2f1d6a4042d':
  MountService: Add StorageVolume as extra in storage related broadcasts.
 2011-05-23 17:06:47 -07:00
Amith Yamasani
51652f5674 Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2 2011-05-23 17:05:47 -07:00
Mike Lockwood
988b6648b0 Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 2011-05-23 17:04:01 -07:00
Irfan Sheriff
0a8bd60a8e Clear network id when invalid 
Bug: 4391449
Change-Id: If0902a3fe4ad65d34dfc3d60f0e630d5e868d6a9
 2011-05-23 17:02:11 -07:00
Mike Lockwood
a5250c9392 MountService: Add StorageVolume as extra in storage related broadcasts. 
Change-Id: I8e1a21ae233ba9812e58b363b59a66b260a01cbf
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-23 20:01:55 -04:00
Dianne Hackborn
37cd57772b Merge "resolved conflicts for merge of 070a19e0 to master" 2011-05-23 16:59:20 -07:00
John Reck
f656d95078 am 82de141d: am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2 
* commit '82de141db736b95b0e388ff060e2d2535192d769':
  DO NOT MERGE Use previous version if version is a codename
 2011-05-23 16:53:28 -07:00
Amith Yamasani
1d2385d08a DO NOT MERGE. Preference activity changes to work on smaller tablet screens. 
Breadcrumbs move to the action bar on certain configs.

Padding around fragments and to the left of preference items
adjusted for different display sizes.

Change-Id: Ie899f9742f4ebd7044f158b1c7db06df82ad2d75
 2011-05-23 16:53:16 -07:00
John Reck
5443ba43bb Update the Desktop UA to Chrome 
Bug: 4347787

Change-Id: I5117c7dbd4e73c39ed417113f12b517de5411e81
 2011-05-23 16:50:29 -07:00
John Reck
82de141db7 am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2 
* commit '4a74eb679917797bf77a20773e0c079f5cc808e4':
  DO NOT MERGE Use previous version if version is a codename
 2011-05-23 16:50:23 -07:00
John Reck
4a74eb6799 Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2 2011-05-23 16:47:32 -07:00