Commit Graph

868 Commits

Author SHA1 Message Date
Brad Fitzpatrick
6be063d8a9 am 5a67749a: am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread
Merge commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1'

* commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1':
  Fix Vibrator permission CTS test broken earlier.
2010-10-19 13:38:00 -07:00
Brad Fitzpatrick
5a67749a35 am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread
Merge commit '987e8d7f9748018d3fee5778645b267a9ee06ff6' into gingerbread-plus-aosp

* commit '987e8d7f9748018d3fee5778645b267a9ee06ff6':
  Fix Vibrator permission CTS test broken earlier.
2010-10-19 12:25:46 -07:00
Brad Fitzpatrick
26e9cf38b2 Fix Vibrator permission CTS test broken earlier.
Bug: 3106964
Change-Id: I76138780ac64f761fe09ef8ba74382c7ee05d794
2010-10-19 11:02:20 -07:00
Nick Pelly
c5469bd67a am 774b943f: am d1f7f4a6: Move hidden API\'s Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
Merge commit '774b943fc6baa7d3e2880382d4dc7ab085d54b65'

* commit '774b943fc6baa7d3e2880382d4dc7ab085d54b65':
  Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
2010-10-18 16:39:30 -07:00
Kenny Root
027610a76e resolved conflicts for merge of 964eb438 to master
Change-Id: I0c54d6b88356d8734d7f51234b0114434414502e
2010-10-18 13:03:35 -07:00
Romain Guy
65202242de am 157fa0ac: am 77c011ba: Set default heap size to 5MB.
Merge commit '157fa0aca55b8e4747f00d2b729e5e361dea7ddb'

* commit '157fa0aca55b8e4747f00d2b729e5e361dea7ddb':
  Set default heap size to 5MB.
2010-10-18 10:33:17 -07:00
Dianne Hackborn
875ecaa511 am 13e46665: am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to have their UID changed over time." into gingerbread
Merge commit '13e46665ff69c1a37880762d7d611aacdf02dac7'

* commit '13e46665ff69c1a37880762d7d611aacdf02dac7':
  Work on issue #3101415: Crespo apps seem to have their UID changed over time.
2010-10-18 08:04:47 -07:00
Nick Pelly
774b943fc6 am d1f7f4a6: Move hidden API\'s Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
Merge commit 'd1f7f4a68375f879671d300510f23d3ee78a500e' into gingerbread-plus-aosp

* commit 'd1f7f4a68375f879671d300510f23d3ee78a500e':
  Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
2010-10-17 17:50:20 -07:00
Nick Pelly
d1f7f4a683 Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
Change-Id: I9bb67de2956b1ecb765ca4ac142ed9455060bec4
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-17 16:30:40 -07:00
Dianne Hackborn
964eb4389b am 42499170: Implement issue #3094621 and #3094609 - wipe sd card
Merge commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0' into gingerbread-plus-aosp

* commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0':
  Implement issue #3094621 and #3094609 - wipe sd card
2010-10-16 16:51:13 -07:00
Dianne Hackborn
424991704b Implement issue #3094621 and #3094609 - wipe sd card
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command

Also since we have decided that it is important to consider
the Crespo storage as internal storage, DevicePolicyManager
gets a new API to be able to wipe it.  (No big deal, since
all of the work for this is now done in the implementation
of the new UI.)

Change-Id: I32a77c410f710a87dcdcbf6586c09bd2e48a8807
2010-10-16 16:32:15 -07:00
Brad Fitzpatrick
da3fe88b2d am 33476b2d: am feebaf35: Merge "Don\'t crash on null Vibrator during reboot." into gingerbread
Merge commit '33476b2db82b5a7f025eb9625fa56f94290e97f4'

* commit '33476b2db82b5a7f025eb9625fa56f94290e97f4':
  Don't crash on null Vibrator during reboot.
2010-10-16 09:13:39 -07:00
Romain Guy
157fa0aca5 am 77c011ba: Set default heap size to 5MB.
Merge commit '77c011ba75ee1403c9b7626e4676cd3c8746605b' into gingerbread-plus-aosp

* commit '77c011ba75ee1403c9b7626e4676cd3c8746605b':
  Set default heap size to 5MB.
2010-10-15 19:23:32 -07:00
Romain Guy
77c011ba75 Set default heap size to 5MB.
Change-Id: Iac8ae3cbe6b431767776653c9f430983172cfb6f
2010-10-15 19:15:25 -07:00
Dianne Hackborn
13e46665ff am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to have their UID changed over time." into gingerbread
Merge commit '736f5ec476526f3431d81dec5fb695bdee27e21a' into gingerbread-plus-aosp

* commit '736f5ec476526f3431d81dec5fb695bdee27e21a':
  Work on issue #3101415: Crespo apps seem to have their UID changed over time.
2010-10-15 18:24:49 -07:00
Jesse Wilson
8718a51a5b Close System.out and System.err streams when they are made unreachable.
Change-Id: I295a9b2e5eb2d4e94b042f3a51e2f39b58a47d49
http://b/3072844
2010-10-15 15:15:20 -07:00
Dianne Hackborn
8bdf5935c0 Work on issue #3101415: Crespo apps seem to have their UID changed over time.
fsync!

Change-Id: Ie6c5397202579935ac69bf61d3e7b3081ecf269c
2010-10-15 14:46:33 -07:00
Brad Fitzpatrick
33476b2db8 am feebaf35: Merge "Don\'t crash on null Vibrator during reboot." into gingerbread
Merge commit 'feebaf35c0edaed87edc6eb33a33ad9df1a209d6' into gingerbread-plus-aosp

* commit 'feebaf35c0edaed87edc6eb33a33ad9df1a209d6':
  Don't crash on null Vibrator during reboot.
2010-10-15 08:51:01 -07:00
Kenny Root
9456714cfb am b4f26a9d: am e6ae5c39: Merge "Add shutdown assurance" into gingerbread
Merge commit 'b4f26a9d37caf7762b66b68d50825c5b075b42bd'

* commit 'b4f26a9d37caf7762b66b68d50825c5b075b42bd':
  Add shutdown assurance
2010-10-15 00:08:22 -07:00
Brad Fitzpatrick
e331644cb5 Don't crash on null Vibrator during reboot.
Bug: 3099305
Change-Id: I9af126f7a719f36ae544f517a2fccd0d33339389
2010-10-14 20:53:06 -07:00
Daniel Lehmann
c61c98fdba am d16f7588: Merge "DO NOT MERGE: Private API to pass the selected tab through QuickContacts" into gingerbread
Merge commit 'd16f7588a88ba98c6c466ee31bb96bc1f9562a98' into gingerbread-plus-aosp

* commit 'd16f7588a88ba98c6c466ee31bb96bc1f9562a98':
  DO NOT MERGE: Private API to pass the selected tab through QuickContacts
2010-10-14 18:34:17 -07:00
Adam Powell
89edde3efa Holo styling and metrics; holo spinners
Change-Id: Ib6d80e5e1a79b7a4ff208df8dbc097e7b9228d13
2010-10-14 16:20:47 -07:00
Chet Haase
2794eb3b02 Remove generics from Animator APIs
Change the manner of constructing Animator-related objects from constructors
via generics to factory methods with type-specific method names. Should
improve the proliferation of warnings due to generics issues and make the
code more readable (less irrelevant angle brackets Floating around).

Change-Id: Ib59a7dd72a95d438022e409ddeac48853082b943
2010-10-14 13:13:34 -07:00
Daniel Lehmann
2f14c62125 DO NOT MERGE: Private API to pass the selected tab through QuickContacts
Bug:3082932

Change-Id: I28dbb21a30fbe22e6e58a8dda534fc9110621c85
2010-10-14 11:26:18 -07:00
Romain Guy
83d6e82132 Revert "Remove generics from Animator APIs"
This reverts commit 41f041d998.
2010-10-14 10:13:53 -07:00
Romain Guy
70ea25fa8a Merge "Remove generics from Animator APIs" 2010-10-14 10:08:12 -07:00
Jaikumar Ganesh
aa4b235dd7 resolved conflicts for merge of 79a5307a to master
Change-Id: I5a524fe53e74df722db003cec6ab62451fe0f899
2010-10-14 09:39:41 -07:00
Chet Haase
41f041d998 Remove generics from Animator APIs
Change the manner of constructing Animator-related objects from constructors
via generics to factory methods with type-specific method names. Should
improve the proliferation of warnings due to generics issues and make the
code more readable (less irrelevant angle brackets Floating around).

Change-Id: I7c1776b15f3c9f245c09fb7de6dc005fdba58fe2
2010-10-14 08:39:00 -07:00
Daniel Sandler
db6303e51e Merge "Dynamically show the menu button on the system bar." 2010-10-13 16:32:07 -07:00
Adam Powell
d8404b2373 Allow icon+text action buttons
Change-Id: I96d1f3958de3ac13cadbab108b87d6bae96e9473
2010-10-13 14:35:19 -07:00
Kenny Root
b4f26a9d37 am e6ae5c39: Merge "Add shutdown assurance" into gingerbread
Merge commit 'e6ae5c39848d2a3a6f3fb750811550969799e410' into gingerbread-plus-aosp

* commit 'e6ae5c39848d2a3a6f3fb750811550969799e410':
  Add shutdown assurance
2010-10-13 14:22:19 -07:00
Daniel Sandler
e02d808abf Dynamically show the menu button on the system bar.
Windows with FLAG_NEEDS_MENU_KEY (or windowNeedsMenuKey=true
in their theme) will cause the system bar to show a menu
icon. (Note that the phone's status bar currently ignores
this, but phones tend to have hardware menu keys anyway.)

Additionally, all windows whose package's SDK version is
pre-Honeycomb will have FLAG_NEEDS_MENU_KEY set by default.

Bug: 3003728

Change-Id: I2d983763a726ea4f32cd1af9b0390e30478b11d1
2010-10-13 16:25:43 -04:00
Kenny Root
f547d679c0 Add shutdown assurance
If something kills system_server before it completes its shutdown
action, the runtime will just restart giving the illusion that a reboot
for an OTA or something else has happened.

To prevent this, write a system property containing the reboot reason
before initiating the shutdown with all the services. If the
system_server is killed before it completes, the next time the main
thread of system_server starts up, it will immediately execute the
shutdown action.

Bug: 3022556
Change-Id: I81723bac333430f04205e7a7b799914d96f170eb
2010-10-13 11:45:35 -07:00
Adam Powell
f16888f1e8 Holo fixes
* Fix up ButtonGroup to behave better.
* Fix bad states with holo list selectors.
* Clean up action mode UI components.
* Change action mode UI to use a text button instead of 'X' to dismiss.
* Fixed spinner dropdowns for Holo.Light

Change-Id: Ifc092bd549ffb539d6a3b2ddd95ebd4b114a441f
2010-10-12 11:57:45 -07:00
Bjorn Bringert
5684d464c0 Merge "Move SyncStateContentProviderHelper to frameworks/ex" 2010-10-12 02:31:42 -07:00
Jean-Baptiste Queru
057c13bcce am c43189e7: am 2aaa1ce1: Merge "Hold partial wakelock during shutdown to avoid entering sleep"
Merge commit 'c43189e76964facad8bac6ee7a17ea1016bba4e3'

* commit 'c43189e76964facad8bac6ee7a17ea1016bba4e3':
  Hold partial wakelock during shutdown to avoid entering sleep
2010-10-11 18:58:25 -07:00
Adam Powell
be4d68e7b2 Updated styles and metrics.
* Added preliminary ButtonGroup support for buttons that display as a unit.
* Fixed a bug with MenuBuilder that caused old-style icon menus to fail.
* Added support for explicitly setting line height in text.

Change-Id: I1ba65f09dd9e1bc833d247ebe72052a21e3f99f0
2010-10-11 11:22:54 -07:00
Bjorn Bringert
888edab661 Move SyncStateContentProviderHelper to frameworks/ex
Change-Id: I26cdb3e72a0075e4df3854b526bdf6bb08d671a2
2010-10-11 07:53:30 +01:00
Jean-Baptiste Queru
c43189e769 am 2aaa1ce1: Merge "Hold partial wakelock during shutdown to avoid entering sleep"
Merge commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c' into gingerbread-plus-aosp

* commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c':
  Hold partial wakelock during shutdown to avoid entering sleep
2010-10-10 18:51:43 -07:00
Dianne Hackborn
50d3fa72d8 am d5423321: am 9934fa77: Merge "Fix issue #3074745: Crash in system process" into gingerbread
Merge commit 'd5423321b920be10c00fbcbc5a702f15e00693a5'

* commit 'd5423321b920be10c00fbcbc5a702f15e00693a5':
  Fix issue #3074745: Crash in system process
2010-10-10 17:47:01 -07:00
Adam Powell
4fb17b0490 Fix alert dialog layout size in landscape
Change-Id: Iff5c388655c357e78c0c0e98d718fb7601c2d543
2010-10-08 17:04:39 -07:00
Dianne Hackborn
d5423321b9 am 9934fa77: Merge "Fix issue #3074745: Crash in system process" into gingerbread
Merge commit '9934fa77efab362729d0d3cb8aa0bdcd31d63ead' into gingerbread-plus-aosp

* commit '9934fa77efab362729d0d3cb8aa0bdcd31d63ead':
  Fix issue #3074745: Crash in system process
2010-10-08 14:12:20 -07:00
Adam Powell
c459622dd1 Merge "Holo theme progress and assets!" 2010-10-08 13:52:55 -07:00
Joe Onorato
481bbb9c11 Merge "Get rid of the global actions menu on tablets." 2010-10-08 13:29:37 -07:00
Joe Onorato
d208e70926 Get rid of the global actions menu on tablets.
We have the system tray for that stuff.  Make long press on power
go directly to the shut down confirmation dialog.  Make that dialog
auto dismiss when the screen goes off.  Reword it when we're skipping
the global actions menu, because it feels too abrupt to say "The
phone will shut down" when they haven't clearly pressed a button
that says shut down.

Change-Id: I8c92a1362bd4ed242e6cd94c2dae6d9ff9c4c34d
2010-10-08 16:28:05 -04:00
Adam Powell
2fbf4de64f Holo theme progress and assets!
* Light and dark dialogs
* Checkboxes and radio buttons
* Toggle buttons

Warning! This is still a work in progress. This does not include final metrics.
Some assets (specifically dialogs) are currently misaligned.
2010-10-08 13:25:17 -07:00
Dianne Hackborn
f47d8f272c Fix issue #3074745: Crash in system process
Also some tweaks to battery history collection to hopefully
improve the data we have.

Change-Id: I178a54a8c2d15cf38dcceaeef939406f50059aa4
2010-10-08 13:00:15 -07:00
Kenny Root
c5610a4c13 am cfc80bd5: am 2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread
Merge commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70'

* commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70':
  Remove lingering system app native libs in /data
2010-10-07 12:21:22 -07:00
satok
47a44916e2 Add InputMethodEnabler for enabling input methods and subtypes
- Copyed functionarity from LanguageSettings.java

TODO: Save enabled InputMethodSubtypes

Change-Id: I7b4fb1a79cb8b3229f88773d261430e23ba7aae2
2010-10-07 14:43:16 +09:00
Gilles Debunne
a4a01b5d6b am 6f4f0106: am b621e203: Merge "Removed icon in Alert dialog header." into gingerbread
Merge commit '6f4f01062bc78ae765c970e8796b8dbef432f8a4'

* commit '6f4f01062bc78ae765c970e8796b8dbef432f8a4':
  Removed icon in Alert dialog header.
2010-10-05 15:17:17 -07:00