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

63303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
9a60c0d466 am ca4100da: Merge "Fix bug 5534667 - Action bar icons need more space on tablet" into ics-mr1 
* commit 'ca4100da0a0481b3b9f464bbc8842b571e8c60d5':
  Fix bug 5534667 - Action bar icons need more space on tablet
 2011-11-01 18:00:58 +00:00
Adam Powell
ca4100da0a Merge "Fix bug 5534667 - Action bar icons need more space on tablet" into ics-mr1 2011-11-01 10:58:58 -07:00
Dianne Hackborn
88175571f2 am f136aa34: Merge "Various performance and other work." into ics-mr1 
* commit 'f136aa341abaaf7fd6f7632d41a30b2989d93985':
  Various performance and other work.
 2011-11-01 17:44:04 +00:00
Dianne Hackborn
f136aa341a Merge "Various performance and other work." into ics-mr1 2011-11-01 10:42:54 -07:00
Peter Ng
d2ff672844 am 374e23bd: Merge "spinner focused states pumped up" into ics-mr1 
* commit '374e23bd11c42e7e472d2490a3dfddb7df198a66':
  spinner focused states pumped up
 2011-11-01 17:31:43 +00:00
Peter Ng
374e23bd11 Merge "spinner focused states pumped up" into ics-mr1 2011-11-01 10:29:25 -07:00
The Android Open Source Project
a31ccdb380 am a0824452: am 9eb4c891: Reconcile with ics-factoryrom-2-release 
* commit 'a0824452d5c511acc7d11396ff2e6423f7b03948':
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
 2011-11-01 17:13:58 +00:00
The Android Open Source Project
a0824452d5 am 9eb4c891: Reconcile with ics-factoryrom-2-release 
* commit '9eb4c891a3db118f2546af7593c6251f3210f3ef':
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
 2011-11-01 17:10:39 +00:00
The Android Open Source Project
9eb4c891a3 Reconcile with ics-factoryrom-2-release 
Change-Id: I82d01dc0c40aeeafc6b10fd1d4bf1464a2f02254
 2011-11-01 10:08:15 -07:00
Philip Milne
c96a88f4fb am 3617933b: Merge " Update to fix for bug 5393156" into ics-mr1 
* commit '3617933bee5a977a7e6c8f8f4b75e580f8bf2ebf':
  Update to fix for bug 5393156
 2011-11-01 16:32:00 +00:00
Philip Milne
3617933bee Merge " Update to fix for bug 5393156" into ics-mr1 2011-11-01 09:30:21 -07:00
Jim Miller
f681cf7d79 am 22726020: am 1dce37bd: Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0 
* commit '2272602032e5051d5067a7a95c741304468a81af':
  Fix 5497305: Make sure we show SIM unlock when "None" is selected
 2011-11-01 07:52:11 +00:00
Jim Miller
2272602032 am 1dce37bd: Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0 
* commit '1dce37bd6bb9b3fe555342f9d2c52e60e10a3fea':
  Fix 5497305: Make sure we show SIM unlock when "None" is selected
 2011-11-01 07:49:46 +00:00
Jim Miller
1dce37bd6b Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0 2011-11-01 00:47:44 -07:00
Adam Powell
24340afbab Fix bug 5534667 - Action bar icons need more space on tablet 
Set a wider minimum width for the action button style on -sw600dp.

Fix an annoying bug where recycled ActionMenuItemViews would retain a
lingering pressed state, causing an unrelated button to glow briefly.

The home/up affordance should not be focusable when it is disabled.

Change-Id: Ia68f3d09f5d977f50e4e33c354d8133367187973
 2011-10-31 22:11:24 -07:00
Chih-Chung Chang
fdfbe58298 am 11ba6da4: am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0 
* commit '11ba6da460572b9ce9cb9dc0d5a76b710e7efdb3':
  Update camera continuous autofocus javadoc.
 2011-11-01 04:09:00 +00:00
Chih-Chung Chang
11ba6da460 am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0 
* commit '4b6353ea0265bfed52d0637abd1b17596ce25ff0':
  Update camera continuous autofocus javadoc.
 2011-11-01 04:05:45 +00:00
Chih-Chung Chang
4b6353ea02 Merge "Update camera continuous autofocus javadoc." into ics-mr0 2011-10-31 21:04:01 -07:00
John Grossman
217418962b Merge "Timesync: Improve logging and reject bad resps." into ics-aah 2011-10-31 20:06:17 -07:00
satok
1fd0109a11 am ff93e417: Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1 
* commit 'ff93e417a217703a635d8601b835853e07233afd':
  Resolve memory leak in TextServicesManagerService
 2011-11-01 01:22:42 +00:00
Jim Miller
9fa1ada318 Fix 5497305: Make sure we show SIM unlock when "None" is selected 
Previously the code ignored SIM state when lockscreen was set to "None."
It now properly accounts for the SIM state when deciding to show.

Change-Id: I272348c1a21b57ac146910850ea3db3adef0227c
 2011-10-31 18:21:49 -07:00
satok
ff93e417a2 Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1 2011-10-31 18:20:48 -07:00
Adam Powell
9e47185b1c am b1db20bd: Merge "Fix bug 5514022 - ListView should not auto-scroll selected item to top when gaining focus" into ics-mr1 
* commit 'b1db20bde5e00c8cdd1a97b07ddcc41f321d3db8':
  Fix bug 5514022 - ListView should not auto-scroll selected item to top when gaining focus
 2011-11-01 01:20:31 +00:00
Adam Powell
b1db20bde5 Merge "Fix bug 5514022 - ListView should not auto-scroll selected item to top when gaining focus" into ics-mr1 2011-10-31 18:18:33 -07:00
Stephen Hines
f780f9010e am af3a854b: am af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0 
* commit 'af3a854b549409c4ad77c686e860f97ea86706a0':
  Fix potential segfault in RS watchdog.
 2011-11-01 00:19:19 +00:00
Stephen Hines
af3a854b54 am af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0 
* commit 'af675222f6340a8a9edbe9e8635014a18521e5e0':
  Fix potential segfault in RS watchdog.
 2011-11-01 00:16:56 +00:00
Stephen Hines
af675222f6 Merge "Fix potential segfault in RS watchdog." into ics-mr0 2011-10-31 17:14:58 -07:00
Dianne Hackborn
2c84cfc001 Various performance and other work. 
- IME service now switches between visible and perceptible depending on
  whether it is being showm, allowing us to more aggressively free its
  memory when not shown.

- The activity display time is no longer delayed by the activity
  transition animation.

- New -R (repeat) option for launching activities with the am command.

- Improved some documentation on Loader to be clear about some methods
  that apps should not normally call.

- FrameworkPerf test now allows you to select individual tests to run.

Change-Id: Id1f73de66dc93d63212183958a72119ad174318b
 2011-10-31 16:52:34 -07:00
The Android Automerger
3b25c4d845 Revert "Merge "Improve the slow query instrumentation." into ics-mr0" 
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
 2011-10-31 16:47:11 -07:00
Adam Powell
dcce1216b0 Fix bug 5514022 - ListView should not auto-scroll selected item to top 
when gaining focus

Change-Id: I9b82cba3d48a211b1d2017d66791bea466938cab
 2011-10-31 16:41:21 -07:00
John Grossman
464a98151c Timesync: Improve logging and reject bad resps. 
+ Improve the state machine logging in the time server so we have some
  visibility into why it is doing the things it is doing.
+ Also, reject sync responses we receive from IP addresses which are
  not our current master.  Given the poor quality of the AAH WiFi
  network right now, we are thrashing a whole lot and can actually get
  into a state where this starts to happen.  Its easy to check and
  reject invalid responses, so do so.

Change-Id: I2318be3998c7f9f77bb25588d935f54394976875
 2011-10-31 16:34:24 -07:00
Philip Milne
6b248641fc Update to fix for bug 5393156 
Tweak to the logic to take account of margins when gravity = FILL is used and
    there is a measurement dependency between the axes (as in mulit-line text).

Cherry pick ecab1178648670f2c72b47faf250040fcded3d13 to MR1

Change-Id: Ic0c95a4618bdb32acca75219796c66c1fc467610
 2011-10-31 16:26:55 -07:00
Eric Laurent
4528548a06 am cd84197a: am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0 
* commit 'cd84197ac1226432de2e13c8fd678a4c88511e0f':
  Fix volume indication in vibrate mode.
 2011-10-31 23:26:07 +00:00
Eric Laurent
cd84197ac1 am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0 
* commit '6e91e5b689a3eb8e6a6f3c038322b8044a9d6670':
  Fix volume indication in vibrate mode.
 2011-10-31 23:23:15 +00:00
Eric Laurent
6e91e5b689 Merge "Fix volume indication in vibrate mode." into ics-mr0 2011-10-31 16:21:16 -07:00
Martijn Coenen
afacee4917 am b288f993: am 1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0 
* commit 'b288f99334348a21ffb465b37a4522998b452410':
  Fix disableForegroundNdefPush crash.
 2011-10-31 22:56:08 +00:00
Martijn Coenen
b288f99334 am 1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0 
* commit '1eca250b9dad45893fead128539f112cbc513496':
  Fix disableForegroundNdefPush crash.
 2011-10-31 22:54:43 +00:00
Martijn Coenen
1eca250b9d Merge "Fix disableForegroundNdefPush crash." into ics-mr0 2011-10-31 15:53:08 -07:00
Stephen Hines
a049184274 Fix potential segfault in RS watchdog. 
BUG=5544671

This initializes the watchdog structure properly. Without this fix, it is
possible to call LOGE with a garbage string value.

Change-Id: Ie05eb65f83eca938f18ac962794407d58c3f277f
 2011-10-31 15:42:40 -07:00
Martijn Coenen
deb0f20c3d Fix disableForegroundNdefPush crash. 
It crashed due to the fact that we're committing a fragment change
after onSaveInstanceState() is called. Instead, commit without
storing the state - as the NfcFragment is something that needs
to be setup explicitly anyway, it is not something the user
expects to be restored.

Bug: 5540962
Change-Id: I5a8cd0e47306f2bbc14b592a0182083bb79cb21a
 2011-10-31 15:42:13 -07:00
Peter Ng
9359979c75 spinner focused states pumped up 
-old spinner states were not visible enough, pumped up the background to solve the issue

Change-Id: I4317d2aeef04409df5be1cca47ced91a5a564f76
 2011-10-31 15:20:47 -07:00
Pannag Sanketi
78e62359e3 am dd79b4c8: Merge "Expose video stabilization API" into ics-mr1 
* commit 'dd79b4c85a9dd2c2ad702ea2137fe2a076567fa1':
  Expose video stabilization API
 2011-10-31 22:07:19 +00:00
Pannag Sanketi
dd79b4c85a Merge "Expose video stabilization API" into ics-mr1 2011-10-31 15:05:19 -07:00
Pannag Sanketi
d47823e359 Expose video stabilization API 
Related to bug:5469735

Change-Id: I0a8245b37eed7f2cb58d35c7a9a7b3b293b64694
 2011-10-31 14:17:46 -07:00
Svetoslav Ganov
71425a6ae9 am 62015f5d: am aeb11b59: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0 
* commit '62015f5d0d1104dfc682b3eb3b6c0be4f63b985a':
  Folding Accessibility Service sample into ApiDemos.
 2011-10-31 20:32:43 +00:00
Svetoslav Ganov
62015f5d0d am aeb11b59: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0 
* commit 'aeb11b598877523fd3c530c7a086c38b4a13c7a1':
  Folding Accessibility Service sample into ApiDemos.
 2011-10-31 20:30:30 +00:00
Svetoslav Ganov
aeb11b5988 Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0 2011-10-31 13:28:57 -07:00
The Android Open Source Project
65e84a171d am d59daca8: Reconcile with ics-mr0-release 
* commit 'd59daca890329fb6aee434cacd1136f40e9e487a':
 2011-10-31 20:09:57 +00:00
The Android Open Source Project
d59daca890 Reconcile with ics-mr0-release 
Change-Id: Ice28e0b55ab17842c9bd01b519b7f4d562822445
 2011-10-31 13:06:22 -07:00
Tom Taylor
4d338ba098 am adfe6383: Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1 
* commit 'adfe6383ee963b890bfbf319d219a23164804925':
  NPE in Threads.getOrCreateThreadId(Telephony.java:1275)
 2011-10-31 19:53:06 +00:00