summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* am 81faa44c: Merge "Move / copy some framework and systemui resources from ↵Joe Onorato2011-05-102-0/+34
|\ | | | | | | | | | | | | xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2 * commit '81faa44c48911e4a63adaa1c92c5a40ea3c58ffb': Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets.
| * Merge "Move / copy some framework and systemui resources from xlarge to ↵Joe Onorato2011-05-102-0/+34
| |\ | | | | | | | | | large. The status bar now comes up on large tablets." into honeycomb-mr2
| | * Move / copy some framework and systemui resources from xlarge to large. The ↵Joe Onorato2011-05-102-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | status bar now comes up on large tablets. Change-Id: I42d810a5b8e61b2959e30abef91477152495d39f
* | | Fix the adding of host routes.Robert Greenwalt2011-05-102-17/+96
| | | | | | | | | | | | | | | | | | We used to just add Change-Id: I991e4cc976cc2932887dd3242fd50e013d521b0a
* | | am 0c6cbf41: Merge "Better compat mode part one: start scaling windows." ↵Dianne Hackborn2011-05-0913-344/+485
|\ \ \ | |/ / | | | | | | | | | | | | | | | into honeycomb-mr2 * commit '0c6cbf410a642f6e9cea7cca0a6e53a4a3cdd324': Better compat mode part one: start scaling windows.
| * | Better compat mode part one: start scaling windows.Dianne Hackborn2011-05-0913-344/+485
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First step of improving app screen size compatibility mode. When running in compat mode, an application's windows are scaled up on the screen rather than being small with 1:1 pixels. Currently we scale the application to fill the entire screen, so don't use an even pixel scaling. Though this may have some negative impact on the appearance (it looks okay to me), it has a big benefit of allowing us to now treat these apps as normal full-screens apps and do the normal transition animations as you move in and out and around in them. This introduces fun stuff in the input system to take care of modifying pointer coordinates to account for the app window surface scaling. The input dispatcher is told about the scale that is being applied to each window and, when there is one, adjusts pointer events appropriately as they are being sent to the transport. Also modified is CompatibilityInfo, which has been greatly simplified to not be so insane and incomprehendible. It is now simple -- when constructed it determines if the given app is compatible with the current screen size and density, and that is that. There are new APIs on ActivityManagerService to put applications that we would traditionally consider compatible with larger screens in compatibility mode. This is the start of a facility to have a UI affordance for a user to switch apps in and out of compatibility. To test switching of modes, there is a new variation of the "am" command to do this: am screen-compat [on|off] [package] This mode switching has the fundamentals of restarting activities when it is changed, though the state still needs to be persisted and the overall mode switch cleaned up. For the few small apps I have tested, things mostly seem to be working well. I know of one problem with the text selection handles being drawn at the wrong position because at some point the window offset is being scaled incorrectly. There are probably other similar issues around the interaction between two windows because the different window coordinate spaces are done in a hacky way instead of being formally integrated into the window manager layout process. Change-Id: Ie038e3746b448135117bd860859d74e360938557
* | Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTEThe Android Automerger2011-05-082-2/+6
|\ \ | |/
| * DO NOT MERGE Handle GET_POWER failuresIrfan Sheriff2011-05-061-1/+3
| | | | | | | | | | | | | | | | Return a failure when GET_POWER returns a non-conforming format Bug: 4380317 Change-Id: Ie723c424ab07774f2be2594aa5deeaa5cd5ac280
| * DO NOT MERGE: Don't send pause again when coming back from full screenTeng-Hui Zhu2011-05-051-1/+3
| | | | | | | | | | | | | | | | | | When we enter full screen, the inline video has been paused. When we re-play in the inline mode, we don't need to paused the previous video, which is the full screen one. bug:4259109 Change-Id: I577edf43563116b0d1a9266d741e6a8aabbca779
| * DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"Mike Lockwood2011-05-031-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | We need this to allow MTP to access secondary external storage devices This reverts commit 35a2ea2fbf156a503d1b0bc6ca7784e51e2462f4. Conflicts: data/etc/platform.xml Change-Id: I0b139a0f3b369c1080831a5b3a48f5d9a330b1bb Signed-off-by: Mike Lockwood <lockwood@android.com>
| * DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-032-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - MTP support for multiple storage units - Add storage_id column to media database for MTP storage ID - Add framework resource for defining mount points and user visible descriptions for multiple volumes - Clean up locking in MtpServer JNI code Change-Id: Ide6d47bd9aa1698ed2a13d695613e03f2a9b29e3 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methodsMike Lockwood2011-05-032-0/+55
| | | | | | | | | | Change-Id: I43d5c1730b340f1288b58012234b38f801001b71 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Fix build break.Robert Greenwalt2011-05-041-2/+2
| | | | | | | | Change-Id: Ic61448f468fb97a2ae032bf5782b33ed8972e20f
* | Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTERobert Greenwalt2011-05-042-9/+20
|\ \
| * | Add auto-restore timeout for secondary networks.Robert Greenwalt2011-05-032-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | Settable per network so you can have not timeout for some and some for others. If you set the old NETWORK_RESTORE_DELAY_PROP_NAME system property (android.telephony.apn-restore) it will override this value. Change-Id: Icca706fdc74245dce679209116660e5dc4b05d23
* | | DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"Mike Lockwood2011-05-041-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this to allow MTP to access secondary external storage devices This reverts commit 35a2ea2fbf156a503d1b0bc6ca7784e51e2462f4. Conflicts: data/etc/platform.xml Change-Id: Iaf9cf120217e8417d328a51db0d82be6835b0ff0 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-042-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - MTP support for multiple storage units - Add storage_id column to media database for MTP storage ID - Add framework resource for defining mount points and user visible descriptions for multiple volumes - Clean up locking in MtpServer JNI code Change-Id: I53d501fd4891ebe27408135fb598027e06b7e495 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methodsMike Lockwood2011-05-042-0/+55
| | | | | | | | | | | | | | | Change-Id: I8ba7e56797b0106dafaa6388393e5c629f27e6e6 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | IMS: Provide net_admin permission so that IPSec could be configured/used.Ramesh Sudini2011-05-031-0/+6
| | | | | | | | | | | | | | | | | | IMS configures the security database in kernel with keys generated from ISIM. Change-Id: Iae9fb85f286ff2a627369d784a127bf7d4d8f4b3
* | | Merge "Make DataConnection asynchronous." into honeycomb-LTEWink Saville2011-05-021-0/+1
|\ \ \
| * | | Make DataConnection asynchronous.Wink Saville2011-05-021-0/+1
| |/ / | | | | | | | | | Change-Id: Ic0e01dded25ba1fdb3b2c6d0f95a1193f608a0e0
* | | Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTERobert Greenwalt2011-05-027-48/+265
|\ \ \
| * | | Add RouteInfo objects for tracking routes.Robert Greenwalt2011-05-027-48/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Used to have list of gateways for default routes, but general static routes should be supported. Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6
* | | | Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTEIrfan Sheriff2011-05-023-3/+395
|\ \ \ \ | |_|/ / |/| | |
| * | | Add DhcpStateMachine for interation with dhcpcdIrfan Sheriff2011-04-303-3/+395
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Supports wakeup and renewal on dhcp - Supports multiple controllers to use the state machine simultaneously - Optionally, a controller can request a notification prior to DHCP request/renewal being sent Change-Id: I3a9d7e6a02ff26be3a86ddca6964683ad3c28f93
* | | | Enhance AsyncChannel.Wink Saville2011-05-022-59/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use Protocol for BASE of CMD's. - Add synchronous connect methods. - Back port sha1 c23971b3e4f92ac31996d4f9f32eef3cb4ef65fd from master Change-Id: If0b3f6cbbb8d4268cad6ca19d26ab2ee42390d86
* | | | am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" ↵Scott Main2011-04-291-13/+75
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | into honeycomb * commit 'de506220d8a3d453463e1abe1b2eb54afd48ec93': docs: more documentation for ProgressBar
| * | am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycombScott Main2011-04-291-13/+75
| |\ \ | | | | | | | | | | | | | | | | * commit '1462813a28270d4255f9542b666960182e274a6e': docs: more documentation for ProgressBar
| | * | docs: more documentation for ProgressBarScott Main2011-04-291-13/+75
| | | | | | | | | | | | | | | | Change-Id: Ief415c0b22da3e7d4ea318e321edc7d215603f0f
* | | | Define Protocol class for use with StateMachineIrfan Sheriff2011-04-281-0/+37
| |_|/ |/| | | | | | | | | | | | | | | | | Adds a common namespace for communication across different state machines Change-Id: I0a9ae872112567afd35a1dc95ac9283170f3f459
* | | Make new networkAttribute parameter non-optional.Robert Greenwalt2011-04-252-15/+11
| | | | | | | | | | | | | | | | | | | | | Dependencymet sets the default dep-met value for the network. Should be set to true unless you know what you're doing. Change-Id: Ifa3765a97615f5333da07bce9defdb8600275129
* | | new LTE prepay related valuesFreeman Ng2011-04-221-0/+16
| | | | | | | | | | | | | | | bug: 4082355 Change-Id: Id5a8f9b8bca64d9cf6ee13b00bd32c4911e9a3fa
* | | am ca7f30eb: am b8a57841: Merge "docs: add a little info to Configuration ↵Scott Main2011-04-211-1/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | class description" into honeycomb * commit 'ca7f30ebb20dcf4c056f57a8c4ab3342cafaed83': docs: add a little info to Configuration class description
| * | am b8a57841: Merge "docs: add a little info to Configuration class ↵Scott Main2011-04-211-1/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | description" into honeycomb * commit 'b8a57841316171d6db4311a65914720213516153': docs: add a little info to Configuration class description
| | * docs: add a little info to Configuration class descriptionScott Main2011-04-201-1/+5
| | | | | | | | | | | | Change-Id: I3278759bd1c323330c1143ef71d0644872caa085
| | * Import revised translations. DO NOT MERGEEric Fischer2011-04-143-8/+8
| | | | | | | | | | | | Change-Id: I796dc2ad1556201f3b443b8185f5280cc8e1e213
| | * Import revised translations. DO NOT MERGEEric Fischer2011-03-298-163/+163
| | | | | | | | | | | | Change-Id: I09aefa0ca2ba1ff78574c8fbad2242d7ef63689d
* | | Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.Wink Saville2011-04-186-349/+468
| | | | | | | | | | | | Change-Id: Ib4b33894da75f5f156066092fb145b478e52f7d7
* | | am 46b59ef0: Merge "Fix access point parsing: reset static link property ↵Xia Wang2011-04-133-57/+26
|\ \ \ | |/ / | | | | | | | | | | | | | | | after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1 * commit '46b59ef01be530a6bbe3f0e9a2bed27de9985f40': Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
| * | Merge "Fix access point parsing: reset static link property after parsing ↵Xia Wang2011-04-133-57/+26
| |\ \ | | | | | | | | | | | | static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
| | * | Fix access point parsing: reset static link property after parsingXia Wang2011-04-083-57/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi Change-Id: I619e79e9bc414b9aeae3537dbc642a7fbc9fca97
* | | | EthernetDataTracker: implement setDependencyMetBenoit Goby2011-04-111-0/+4
| | | | | | | | | | | | | | | | Change-Id: I4be804e3c9dccacfacb5cb813a4ad6f513224f06
* | | | resolved conflicts for merge of 08c39c6a to honeycomb-LTEBenoit Goby2011-04-111-0/+333
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
| * | | Add support for USB Ethernet adaptersBenoit Goby2011-04-112-2/+335
| | | | | | | | | | | | | | | | Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d
* | | | Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTEWink Saville2011-04-113-255/+230
|\ \ \ \
| * | | | Move ProcessedMessage into HierarchicalStateMachine.Wink Saville2011-04-113-255/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ProcessedMessage is really private to HSM and so moving it into the HSM class. Change-Id: Ida476fc7aae5e9bfb6ac632dac979e11f489b6fc
* | | | | Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTEFreeman Ng2011-04-111-0/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add prepaid data services URL to Secure SettingsFreeman Ng2011-04-071-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is really a Gservices value being accessed through Secure Settings bug: 4100048 Change-Id: I6e2eb72b17594b5c8f14a6ecfc21eafeff80fa1b
* | | | | am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix ↵Nicolas Roard2011-04-071-1/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | for bug:4183801" into honeycomb-mr1 * commit 'fcba23536b1b432a5977e1ba4ea70ae0ff5aed4a': Remove uncalled function -- java counterpart of the fix for bug:4183801
| * | | | Merge "Remove uncalled function -- java counterpart of the fix for ↵Nicolas Roard2011-04-071-1/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | bug:4183801" into honeycomb-mr1