Commit Graph

15631 Commits

Author SHA1 Message Date
Teng-Hui Zhu
858daa1fbb am a0e661b4: am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2
* commit 'a0e661b4e4f489fa7c5c2ebadcffc8e6f71132eb':
  Fix the Uri parsing issue
2011-05-12 15:05:29 -07:00
Dianne Hackborn
0e59729b10 am 97280816: am 0f1de9ad: New compat mode front end: UI and persistence.
* commit '972808164adde6c0784e9c836d06219a9cf7eb7f':
  New compat mode front end: UI and persistence.
2011-05-12 15:05:19 -07:00
Teng-Hui Zhu
a0e661b4e4 am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2
* commit 'c1a005c356c18ffb676f16b2f6d6d8f361abafe2':
  Fix the Uri parsing issue
2011-05-12 15:01:56 -07:00
Dianne Hackborn
972808164a am 0f1de9ad: New compat mode front end: UI and persistence.
* commit '0f1de9adde0b52d2a385a76232bd7ac30c3eeea2':
  New compat mode front end: UI and persistence.
2011-05-12 15:01:53 -07:00
Teng-Hui Zhu
c1a005c356 Merge "Fix the Uri parsing issue" into honeycomb-mr2 2011-05-12 14:11:25 -07:00
Wink Saville
9c7c879414 am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE
* commit '76a118dd9e1bc8be33e1e22b7264b7f918f6f050':
  Fix initialization of RouteInfo
2011-05-12 14:03:31 -07:00
Teng-Hui Zhu
64855da755 Fix the Uri parsing issue
Switching back to use the setDataSource with Uri, which can handle both the
file and http path correctly.

Change-Id: I5bfc1d01a8de0a4f8640ffceafbc17984833097a
2011-05-12 13:53:48 -07:00
Dianne Hackborn
0f1de9adde New compat mode front end: UI and persistence.
Adds a really crappy UI for toggling compat mode.

Persists compat mode selection across boots.

Turns on compat mode by default for newly installed apps.

Change-Id: Idc83494397bd17c41450bc9e9a05e4386c509399
2011-05-12 13:28:45 -07:00
Kazuhiro Ondo
8c0b528a47 Fix initialization of RouteInfo
IPv6 gateway is not correctly set in RouteInfo

Change-Id: I24b1ab71a64e3097c9ba641899240fc27847b86c
2011-05-11 16:02:00 -07:00
Robert Greenwalt
441bc9a6f4 am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE
* commit 'e6848faceff58f84f671dbc73be08ef7890fea09':
  Fix the adding of host routes.
2011-05-10 11:53:57 -07:00
Robert Greenwalt
f43396caaa Fix the adding of host routes.
We used to just add

Change-Id: I991e4cc976cc2932887dd3242fd50e013d521b0a
2011-05-10 11:27:46 -07:00
Dianne Hackborn
05be6d6fe0 am 4907d1d5: am 0c6cbf41: Merge "Better compat mode part one: start scaling windows." into honeycomb-mr2
* commit '4907d1d5e2c7d244b07579b8c52153df69754e85':
  Better compat mode part one: start scaling windows.
2011-05-09 17:10:34 -07:00
Dianne Hackborn
4907d1d5e2 am 0c6cbf41: Merge "Better compat mode part one: start scaling windows." into honeycomb-mr2
* commit '0c6cbf410a642f6e9cea7cca0a6e53a4a3cdd324':
  Better compat mode part one: start scaling windows.
2011-05-09 17:08:40 -07:00
Dianne Hackborn
e2515eebf4 Better compat mode part one: start scaling windows.
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
2011-05-09 17:03:24 -07:00
The Android Automerger
bdaa3abdf2 am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE
* commit '44e39d608cfddcbf56123480123822f26f20f259':
  DO NOT MERGE Handle GET_POWER failures
  DO NOT MERGE: Don't send pause again when coming back from full screen
  DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
  DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
  DO NOT MERGE MTP: Implement GetThumb command
  DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
  DO NOT MERGE MTP: Add extended operations to support in-place editing of files
  DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
  DO NOT MERGE Fix media scanner uri handling.
  DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
  DO NOT MERGE MTP and media provider support for multiple storage devices:
  DO NOT MERGE MountService: Fix running media scanner at boot.
  DO NOT MERGE Fix deadlock in MountService
  DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
  DO NOT MERGE MountService: Add support for multiple volumes
2011-05-09 10:40:14 -07:00
The Android Automerger
44e39d608c Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE 2011-05-08 22:38:02 -07:00
Teng-Hui Zhu
a8f6a0d90c DO NOT MERGE: Don't send pause again when coming back from full screen
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
2011-05-05 14:34:26 -07:00
Robert Greenwalt
9c7e6fc506 am f13eb830: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
* commit 'f13eb8301f4704179938e374129f2943c9c38d5f':
  Add auto-restore timeout for secondary networks.
2011-05-04 10:02:16 -07:00
Robert Greenwalt
f13eb8301f Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE 2011-05-04 09:59:30 -07:00
Mike Lockwood
21c0800f71 am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices:
* commit 'd3e4290c0442b6dcf24bcf642f4fc26d12d8e7aa':
  DO NOT MERGE MTP and media provider support for multiple storage devices:
2011-05-04 08:57:23 -07:00
Mike Lockwood
a2a8419db8 am e3b498be: DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
* commit 'e3b498be0ae05367e9b84f4fac2ac5cf57a6b091':
  DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
2011-05-04 08:57:07 -07:00
Mike Lockwood
d3e4290c04 DO NOT MERGE MTP and media provider support for multiple storage devices:
- 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>
2011-05-04 10:41:20 -04:00
Mike Lockwood
e3b498be0a DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
Change-Id: I8ba7e56797b0106dafaa6388393e5c629f27e6e6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:19 -04:00
Robert Greenwalt
f2102f7a1a Add auto-restore timeout for secondary networks.
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
2011-05-03 19:10:26 -07:00
Mike Lockwood
7ae938be1b DO NOT MERGE MTP and media provider support for multiple storage devices:
- 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>
2011-05-03 21:03:56 -04:00
Mike Lockwood
d967f4664f DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
Change-Id: I43d5c1730b340f1288b58012234b38f801001b71
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:55 -04:00
Conley Owens
2d40bf91e6 am eac835e5: am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code."
* commit 'eac835e52e8378b33a2b34b7edb803290154588d':
  Removing dead store; it was likely a relict of debuging code.
2011-05-03 16:14:31 -07:00
Robert Greenwalt
db46fa25be am a47c4019: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
* commit 'a47c40193fcbe9ca07facea78b2828afdae5e025':
  Add RouteInfo objects for tracking routes.
2011-05-02 13:29:22 -07:00
Robert Greenwalt
a47c40193f Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 2011-05-02 13:26:52 -07:00
Irfan Sheriff
d369d64ee7 am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE
* commit '8ab6a6d415156bb543a735612fbbdecfbff6c3a4':
  Add DhcpStateMachine for interation with dhcpcd
2011-05-02 12:26:52 -07:00
Irfan Sheriff
8ab6a6d415 Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 2011-05-02 11:49:46 -07:00
Robert Greenwalt
aa70f101e0 Add RouteInfo objects for tracking routes.
Used to have list of gateways for default routes, but general static routes
should be supported.

Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6
2011-05-02 11:17:30 -07:00
Conley Owens
9c4ba2580e Merge "Removing dead store; it was likely a relict of debuging code." 2011-05-02 09:53:25 -07:00
Irfan Sheriff
31be7cf4c7 Add DhcpStateMachine for interation with dhcpcd
- 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
2011-04-30 12:58:51 -07:00
Conley Owens
a3dcd0a3f1 Merged "Adjust mBiggerTouchSlopSquare to the suitable value"
Conflicts:
	core/java/android/view/ViewConfiguration.java

Change-Id: I74de006dbb19fd878591bc90955a1c6e74aa084e
2011-04-29 17:49:06 -07:00
Conley Owens
dddaa56f79 Merge commit 'b737647d' (Scrolling using arrow keys with padding) into m
Conflicts:
	core/java/android/widget/ScrollView.java

Change-Id: I1cfd3f7091e92793ce9fa048a09ae08a04c10c80
2011-04-29 17:35:29 -07:00
Conley Owens
f395e3042a am 19653c64: am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"
* commit '19653c6440eaf7328ecbc01c3ca6d7a910906484':
  CHAR_SEQUENCE_CREATOR cannot handle null string
2011-04-29 17:15:39 -07:00
Conley Owens
c30d767628 am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information >
* commit '1a846ab089878a6b342c6bc3e8850fc2e0ef3080':
  Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown
2011-04-29 17:07:14 -07:00
Scott Main
75c78dc364 am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit '511ec082bb198cfd04aebdccf56db6f4c8df9523':
  docs: more documentation for ProgressBar
2011-04-29 15:05:10 -07:00
Scott Main
511ec082bb am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit 'de506220d8a3d453463e1abe1b2eb54afd48ec93':
  docs: more documentation for ProgressBar
2011-04-29 14:59:08 -07:00
Conley Owens
c703b49eb1 am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()"
* commit '54668b8a3599559fc007af1d75c039400a05e898':
  Added null check on return value for getKeyDispatcherState()
2011-04-29 14:57:53 -07:00
Conley Owens
27e8f1a3a6 am 8b22ef66: am e41d2aed: Merge "Using robust equality check."
* commit '8b22ef66ef1a67333e2f1d4250d2c134b50ef91a':
  Using robust equality check.
2011-04-29 14:56:15 -07:00
Conley Owens
014757eea2 am a9517012: am 1e29552b: Merge "We don\'t need these local references."
* commit 'a95170122619f5442d5efbdf2e37f91dbf455ab9':
  We don't need these local references.
2011-04-29 14:56:05 -07:00
Conley Owens
49df110aeb am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
* commit 'd66a92e6875bfc835adf0b100607afbf4bfc2761':
  Eliminating dead code with no other effect than consuming battery life.
2011-04-29 14:55:55 -07:00
Scott Main
de506220d8 am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit '1462813a28270d4255f9542b666960182e274a6e':
  docs: more documentation for ProgressBar
2011-04-29 14:55:43 -07:00
Scott Main
42f139c069 docs: more documentation for ProgressBar
Change-Id: Ief415c0b22da3e7d4ea318e321edc7d215603f0f
2011-04-29 14:51:05 -07:00
Conley Owens
eb8171bcff Merge "Adjust mBiggerTouchSlopSquare to the suitable value" 2011-04-29 10:01:23 -07:00
Conley Owens
76616b138e Merge "Scolling using arrow keys with padding" 2011-04-29 10:00:26 -07:00
Conley Owens
425db473a0 Merge "CHAR_SEQUENCE_CREATOR cannot handle null string" 2011-04-29 10:00:20 -07:00
Conley Owens
b1578d85ce Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown" 2011-04-29 09:59:48 -07:00