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

63430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Onorato
d488cb6136 Merge "Make ActivityManagerService just kill apps when they crash on tungsten." into ics-aah 2011-11-02 20:52:09 -07:00
Joe Onorato
e332aa1431 Make ActivityManagerService just kill apps when they crash on tungsten. 
Change-Id: I62e6a7b5e0a9b19e4906219292eb0ac9b9774141
 2011-11-02 20:50:08 -07:00
Eric Fischer
ff6137f58d am c37f98ea: am 8c49b81b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit 'c37f98eab3d6e63f71b1600ea0e4355c6503384b':
  Import revised translations.  DO NOT MERGE
 2011-11-03 00:07:21 +00:00
Katie McCormick
aa40dc08c4 am f2158d08: am e08be659: Merge "Doc change: Update instructions to match ICS UI" into ics-mr0 
* commit 'f2158d0820ca6c243fd807224c7e8ebb96cd8d2b':
  Doc change: Update instructions to match ICS UI
 2011-11-03 00:07:19 +00:00
Katie McCormick
26d3335293 am 31a05f33: Doc change: Update instructions to match ICS UI 
* commit '31a05f336ac99ab4ecfb5e227aca40f8fc7140cb':
  Doc change: Update instructions to match ICS UI
 2011-11-03 00:07:18 +00:00
Eric Fischer
c37f98eab3 am 8c49b81b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '8c49b81b5971c3fd254c4ecd862d1a32b1917edb':
  Import revised translations.  DO NOT MERGE
 2011-11-03 00:04:10 +00:00
Katie McCormick
f2158d0820 am e08be659: Merge "Doc change: Update instructions to match ICS UI" into ics-mr0 
* commit 'e08be659eba742d117d24f642a95ba65e13bd015':
  Doc change: Update instructions to match ICS UI
 2011-11-03 00:04:09 +00:00
Eric Fischer
8c49b81b59 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-11-02 16:17:03 -07:00
Joe Onorato
407dc3ce13 Merge changes Id270a8cf,I439bba75 into ics-aah 
* changes:
  The API doesn't need a container here, all it needs is a Context.
  Parcelables are flattenable for now.
 2011-11-02 16:09:38 -07:00
Katie McCormick
31a05f336a Doc change: Update instructions to match ICS UI 
Change-Id: I565ef27401d169ff28b21f1679e56a725c1ac470
 2011-11-02 23:00:59 +00:00
Adam Powell
9dc8a42638 am b41d9f8a: Merge "Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled" into ics-mr1 
* commit 'b41d9f8a84a325241440b6e950dea6d240134823':
  Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled
 2011-11-02 22:45:57 +00:00
Joe Onorato
35573c0fa0 Merge "Add clear-data command to am to wipe the given package's data." into ics-aah 2011-11-02 15:45:24 -07:00
Adam Powell
b41d9f8a84 Merge "Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled" into ics-mr1 2011-11-02 15:44:31 -07:00
Katie McCormick
e08be659eb Merge "Doc change: Update instructions to match ICS UI" into ics-mr0 2011-11-02 15:42:18 -07:00
Eric Fischer
2237e1e7b6 Import revised translations. DO NOT MERGE 
Change-Id: I2f073cc6d62d757ba4e6565a0c7974ca9cecba4c
 2011-11-02 15:14:43 -07:00
Irfan Sheriff
c5a4318b73 am b419abca: am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0 
* commit 'b419abcadad79cd908acfe51dc6e8902c16ff728':
  Avoid duplicate dialogs leading to NPE
 2011-11-02 21:41:00 +00:00
Irfan Sheriff
b419abcada am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0 
* commit '7f00c22b7fa7b38b644585c0a3c6faadc5def94c':
  Avoid duplicate dialogs leading to NPE
 2011-11-02 21:38:55 +00:00
Irfan Sheriff
7f00c22b7f Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0 2011-11-02 14:37:19 -07:00
Adam Powell
2db4e4bd1b Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary 
stopped if "defer start" is enabled

Only revise the target state in moveToState if it would cross the
stopped/started boundary.

Change-Id: I8f6e400331157eac9343261117cf633611fc1e4d
 2011-11-02 14:30:47 -07:00
Robert Greenwalt
7e7fe83cd0 am 4a113251: am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0 
* commit '4a113251078ad028d1a071ebf5562185275c7039':
  Ignore errors when untethering
 2011-11-02 21:30:30 +00:00
Robert Greenwalt
4a11325107 am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0 
* commit '451fa13e82ea1226895b41282fdb33bf9fea5d19':
  Ignore errors when untethering
 2011-11-02 21:28:33 +00:00
Robert Greenwalt
451fa13e82 Merge "Ignore errors when untethering" into ics-mr0 2011-11-02 14:26:45 -07:00
Katie McCormick
0d842cc918 Doc change: Update instructions to match ICS UI 
Change-Id: I565ef27401d169ff28b21f1679e56a725c1ac470
 2011-11-02 14:07:52 -07:00
Robert Greenwalt
731026c2df Ignore errors when untethering 
Sometimes the interface is removed before we can untether leading to
errors when cleanup up various rules (iptables).  Do as much as we can
and then let a re-tether result in error if needed.

bug:5536516
Change-Id: Ib1d064ecc8e9022566f9b0e4678b33144906971c
 2011-11-02 13:53:28 -07:00
Scott Main
13462bcbd9 am 42774dec: am aea8d850: docs: a couple typos bugs 5552478 5553096 
* commit '42774decd903d0bbd1c57c9aa829719f2a683231':
  docs: a couple typos bugs 5552478 5553096
 2011-11-02 19:12:04 +00:00
Scott Main
42774decd9 am aea8d850: docs: a couple typos bugs 5552478 5553096 
* commit 'aea8d8500395f7e7dce3f670933f7aaf02be7b11':
  docs: a couple typos bugs 5552478 5553096
 2011-11-02 19:10:21 +00:00
Scott Main
aea8d85003 docs: a couple typos 
bugs 5552478 5553096

Change-Id: Ibeafacd446edf99096e125f5dfaa7c13a6ab1776
 2011-11-02 12:05:51 -07:00
Svetoslav Ganov
93517dc3ea am 1997fe14: Merge "Update KeyBoardView to reflect the interaction model in Latin IME" into ics-mr1 
* commit '1997fe1482ecf1ca920c7729a1ad9df5340565f3':
  Update KeyBoardView to reflect the interaction model in Latin IME
 2011-11-02 18:53:52 +00:00
Svetoslav Ganov
1997fe1482 Merge "Update KeyBoardView to reflect the interaction model in Latin IME" into ics-mr1 2011-11-02 11:51:58 -07:00
Peter Ng
b1a2b3f5e9 am 779c1b85: Merge "Make the notification panel header opaque." into ics-mr1 
* commit '779c1b8507d939bd3bd6d3e758ded095d91bcd6f':
  Make the notification panel header opaque.
 2011-11-02 18:49:34 +00:00
Peter Ng
aef92c5cbd am c7dbfc64: Merge "making slide unlock on tablet have a larger radius" into ics-mr1 
* commit 'c7dbfc640bcbc6a238068742aeaa76473e56037e':
  making slide unlock on tablet have a larger radius
 2011-11-02 18:49:33 +00:00
Peter Ng
779c1b8507 Merge "Make the notification panel header opaque." into ics-mr1 2011-11-02 11:47:04 -07:00
Peter Ng
c7dbfc640b Merge "making slide unlock on tablet have a larger radius" into ics-mr1 2011-11-02 11:46:32 -07:00
Amith Yamasani
5cbac4c12e am dab15d14: Merge "Don\'t expand the SearchView if already expanded." into ics-mr1 
* commit 'dab15d14ca2ce9c3a614e97869824c6337e76d51':
  Don't expand the SearchView if already expanded.
 2011-11-02 18:45:38 +00:00
Amith Yamasani
dab15d14ca Merge "Don't expand the SearchView if already expanded." into ics-mr1 2011-11-02 11:43:53 -07:00
The Android Open Source Project
58a6f23fac am 11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release 
* commit '11b49ba933bab7ff8262139141eef0e5f3c45a18':
  Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
  Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
  Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
  Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
 2011-11-02 17:56:48 +00:00
The Android Open Source Project
11b49ba933 Reconcile with ics-mr0-release ics-factoryrom-2-release 
Change-Id: I493695d0ea182f32bbfe0e148e192ad1f60ff001
 2011-11-02 10:52:49 -07:00
Adam Powell
7939246dc0 am 7a5a50c1: Merge "Bug 5513073 - IllegalArgumentException: View not attached to window manager" into ics-mr1 
* commit '7a5a50c12f6a6e094d1e8aa7514df37f1176354a':
  Bug 5513073 - IllegalArgumentException: View not attached to window manager
 2011-11-02 17:50:13 +00:00
Adam Powell
7a5a50c12f Merge "Bug 5513073 - IllegalArgumentException: View not attached to window manager" into ics-mr1 2011-11-02 10:33:52 -07:00
The Android Automerger
beb470af43 Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0" 
This reverts commit f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3, reversing
changes made to bd9b1528051a1b257768fdbc5077a2d4473b02dd.
 2011-11-02 10:18:09 -07:00
Svetoslav Ganov
3a0d4d7cbf am e5d0f199: Merge "CalendarView title incorrectly updated for different languages." into ics-mr1 
* commit 'e5d0f19953189fdd0e2661ebb7f0ea925f14ea13':
  CalendarView title incorrectly updated for different languages.
 2011-11-02 17:17:32 +00:00
Svetoslav Ganov
d5a077b89e am 6e42470f: Merge "Accessibility window query APIs should respect root name space." into ics-mr1 
* commit '6e42470f928bbf60c9fd3d17a2a69a4b96cec170':
  Accessibility window query APIs should respect root name space.
 2011-11-02 17:17:30 +00:00
Svetoslav Ganov
d55e4cca62 am 7f0c850b: Merge "Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes." into ics-mr1 
* commit '7f0c850b7a4a2b8a135a110a33d053f4d6689559':
  Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes.
 2011-11-02 17:15:09 +00:00
Svetoslav Ganov
e5d0f19953 Merge "CalendarView title incorrectly updated for different languages." into ics-mr1 2011-11-02 10:14:46 -07:00
The Android Automerger
8e31988d26 Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0" 
This reverts commit 4b6353ea0265bfed52d0637abd1b17596ce25ff0, reversing
changes made to af675222f6340a8a9edbe9e8635014a18521e5e0.
 2011-11-02 10:14:18 -07:00
Svetoslav Ganov
6e42470f92 Merge "Accessibility window query APIs should respect root name space." into ics-mr1 2011-11-02 10:13:55 -07:00
Svetoslav Ganov
7f0c850b7a Merge "Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes." into ics-mr1 2011-11-02 10:13:17 -07:00
The Android Automerger
5070dd097c Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0" 
This reverts commit af675222f6340a8a9edbe9e8635014a18521e5e0, reversing
changes made to 6e91e5b689a3eb8e6a6f3c038322b8044a9d6670.
 2011-11-02 10:07:57 -07:00
The Android Automerger
5db81e1f1c Revert "Merge "Improve the slow query instrumentation." into ics-mr0" 
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
 2011-11-02 10:05:33 -07:00
The Android Automerger
8063b843e4 merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-11-02 09:48:55 -07:00