Commit Graph

1762 Commits

Author SHA1 Message Date
Christopher Tate
b0628bfd5a Implement shared-storage full backup/restore
Every available shared-storage volume is backed up, tagged with its
ordinal in the set of mounted shared volumes.  This is an approximation
of "internal + the external card".  This lets us restore things to the
same volume [or "equivalent" volume, in the case of a cross-model
restore] as they originated on.

Also fixed a bug in the handling of files/dirs with spaces in
their names.

Change-Id: I380019da8d0bb5b3699bd7c11eeff621a88e78c3
2011-06-07 12:16:27 -07:00
Dianne Hackborn
3267d356d1 am 7e5ca578: am b4815f47: am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2
* commit '7e5ca5781b406d4f862254dad1758b91ce89f896':
  Fix to not lose state when saving a deactivated fragment.
2011-06-03 18:02:10 -07:00
Dianne Hackborn
29bf330727 am e826feb6: am dddd6b15: am 185e3e24: Fix when managed cursors are required.
* commit 'e826feb66c2a3690716136c24926606eafe827dc':
  Fix when managed cursors are required.
2011-06-03 18:01:57 -07:00
Dianne Hackborn
7e5ca5781b am b4815f47: am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2
* commit 'b4815f47e6d612da6e2d0650a2d8f103626e3ec7':
  Fix to not lose state when saving a deactivated fragment.
2011-06-03 17:57:33 -07:00
Dianne Hackborn
b4815f47e6 am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2
* commit 'bd754205d0b59315582855329649dad925a04b82':
  Fix to not lose state when saving a deactivated fragment.
2011-06-03 17:54:28 -07:00
Dianne Hackborn
1333276c7a Fix to not lose state when saving a deactivated fragment.
Also deactivating a fragment shouldn't put it in the exiting state.

Change-Id: I514f3589ee7bbbee131cd7b4a48803e99b212bd0
2011-06-03 17:34:45 -07:00
Dianne Hackborn
e826feb66c am dddd6b15: am 185e3e24: Fix when managed cursors are required.
* commit 'dddd6b15d5274a6138facec9f553336fac5f6de6':
  Fix when managed cursors are required.
2011-06-03 16:27:36 -07:00
Dianne Hackborn
dddd6b15d5 am 185e3e24: Fix when managed cursors are required.
* commit '185e3e243ee1da136bcace854026b8abaf0c4c86':
  Fix when managed cursors are required.
2011-06-03 16:23:15 -07:00
Dianne Hackborn
3c43ced841 resolved conflicts for merge of d247ee41 to master
Change-Id: I49bd932f5019ce0608e2661d5cb7f24b6122dcba
2011-06-03 16:16:55 -07:00
Dianne Hackborn
185e3e243e Fix when managed cursors are required.
Only do this when we are actually restarting, not when we
are just resuming after a pause.

Change-Id: I32fd263917b03776efca8e096d0343107721398d
2011-06-03 15:26:40 -07:00
Dianne Hackborn
2515db74fe am 3a80c504: am 8b9a2b6c: am e6676351: Work around OpenFeint bug.
* commit '3a80c50485809fe72d6de83dacad494c5e84ed24':
  Work around OpenFeint bug.
2011-06-03 14:43:18 -07:00
Dianne Hackborn
50469db071 am 7322e557: am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2
* commit '7322e557cfe42da42779625d69ced2db74a9df90':
  Fix issue #4502672: Wrong xml resources used for homescreen widgets.
2011-06-03 13:17:00 -07:00
Dianne Hackborn
d247ee41d6 am 758b67b1: am b46ed763: Add new Fragment API for explicitly saving/restoring state.
* commit '758b67b12386a6ea52d520aef455c3150c9bae03':
  Add new Fragment API for explicitly saving/restoring state.
2011-06-02 19:33:22 -07:00
Dianne Hackborn
758b67b123 am b46ed763: Add new Fragment API for explicitly saving/restoring state.
* commit 'b46ed7636be9341b6ce0b158b3d86f34a437e6da':
  Add new Fragment API for explicitly saving/restoring state.
2011-06-02 19:30:34 -07:00
Dianne Hackborn
b46ed7636b Add new Fragment API for explicitly saving/restoring state.
Also fix issue #4519821:
Blank screen displayed on tapping "Battery Use" option in the settings

We weren't correctly doing the full Activity resume code when coming
back from delivering a new Intent or result.

And fix a fragment problem where we still weren't correctly restoring
the state of list views.  (I think this was from a bad manual-merge
from master.)

Change-Id: If79dc7e998155c39ab8c04781f6c73a82238a9ef
2011-06-02 19:18:07 -07:00
Dianne Hackborn
546d64f56d resolved conflicts for merge of 5c2e4d20 to master
Change-Id: Iadbee872468ceafb54c5877046c91f6052f3c953
2011-06-02 14:29:13 -07:00
Dianne Hackborn
ed60f81940 resolved conflicts for merge of 76450622 to master
Change-Id: I26ccd8f264e65f100d894f43cf597a781552db83
2011-06-02 09:20:52 -07:00
Dianne Hackborn
3a80c50485 am 8b9a2b6c: am e6676351: Work around OpenFeint bug.
* commit '8b9a2b6cbd9cf37e9f5aa1bfc7106c67a5e89202':
  Work around OpenFeint bug.
2011-06-01 19:08:53 -07:00
Dianne Hackborn
8b9a2b6cbd am e6676351: Work around OpenFeint bug.
* commit 'e66763516a9c27c192adaba417616371a1c3c9bf':
  Work around OpenFeint bug.
2011-06-01 18:29:50 -07:00
Dianne Hackborn
e66763516a Work around OpenFeint bug.
Change-Id: Ib8320e50bb63fc56dc0118d5c8e9e328dbd3fcb1
2011-06-01 16:52:36 -07:00
Christopher Tate
75a99709ac Restore from a previous full backup's tarfile
Usage:  adb restore [tarfilename]

Restores app data [and installs the apps if necessary from the backup
file] captured in a previous invocation of 'adb backup'.  The user
must explicitly acknowledge the action on-device before it is allowed
to proceed; this prevents any "invisible" pushes of content from the
host to the device.

Known issues:

* The settings databases and wallpaper are saved/restored, but lots
  of other system state is not yet captured in the full backup.  This
  means that for practical purposes this is usable for 3rd party
  apps at present but not for full-system cloning/imaging.

Change-Id: I0c748b645845e7c9178e30bf142857861a64efd3
2011-06-01 15:09:55 -07:00
Dianne Hackborn
36f80f3a5a resolved conflicts for merge of 590ec479 to master
Change-Id: I30503da6a73b9cb15eee66a67c75d50ccdc4b9f0
2011-05-31 23:11:16 -07:00
Dianne Hackborn
7322e557cf am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2
* commit 'a4cfcf10cc300a1eb5b2a4254fb7d3190c56c4f1':
  Fix issue #4502672: Wrong xml resources used for homescreen widgets.
2011-05-31 18:11:29 -07:00
Dianne Hackborn
a4cfcf10cc am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2
* commit '75d6b3c2a24224e41e87685db0d9d0b8abea091d':
  Fix issue #4502672: Wrong xml resources used for homescreen widgets.
2011-05-31 18:08:27 -07:00
Dianne Hackborn
2f0b17573d Fix issue #4502672: Wrong xml resources used for homescreen widgets.
There was a race in the system process between applying the initial
configuration and executing code in higher-level system services
like the app widget service that relies on the config.  For some
reason it starting showing up more after my code changes; it should
now be completely fixed.

Also fix the activity starting window to run in compatibility mode
if its application is going to be in compatibility mode.

And some various cleanup and small fixes.

Change-Id: I0566933bf1bbb4259c1d99a60c0a3c19af1542e5
2011-05-31 18:04:14 -07:00
Dianne Hackborn
5c2e4d20df am 8fcbfb52: am 94250ac6: Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2
* commit '8fcbfb52607263754b6d3895a112f792c5c3a12e':
  Add new supports-screens attributes for declaring the compatible screens.
2011-05-26 17:12:36 -07:00
Dianne Hackborn
8fcbfb5260 am 94250ac6: Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2
* commit '94250ac69c6e07534e4781d3479dccb79d8c366c':
  Add new supports-screens attributes for declaring the compatible screens.
2011-05-26 17:09:39 -07:00
Dianne Hackborn
94250ac69c Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2 2011-05-26 17:07:52 -07:00
Dianne Hackborn
df6e980e3f Add new supports-screens attributes for declaring the compatible screens.
Change-Id: I40d57e4354e48accc1027c9f90916ea73eb5190d
android:requiresSmallestWidthDp provides the smallest supported width.
android:compatibleWidthLimitDp provides the largest compatible width.
2011-05-26 14:48:04 -07:00
Dianne Hackborn
76450622f0 am d5238cc1: am 7a09f72b: Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2
* commit 'd5238cc1ab8366389b2aada228f2f2e5cbb3244e':
  Rework how we decide whether to use system or status bar.
2011-05-26 14:14:35 -07:00
Kenny Root
5e34a1945a am 1d8f8819: Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2
* commit '1d8f8819f1e98cdf3b7756396158613e95fe9eb6':
  Break apart queries to getInstalled* API DO NOT MERGE
2011-05-26 13:34:42 -07:00
Dianne Hackborn
d5238cc1ab am 7a09f72b: Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2
* commit '7a09f72b8850ec22e4ca7fd50aba20ead7666f67':
  Rework how we decide whether to use system or status bar.
2011-05-26 13:34:33 -07:00
Kenny Root
1d8f8819f1 Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2 2011-05-26 13:10:23 -07:00
Dianne Hackborn
590ec479fd am 80ef2a97: am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2
* commit '80ef2a9745e6103efd9698577536bbfed1fd74f6':
  Spiffy new compatibility mode UI.
2011-05-26 11:02:52 -07:00
Dianne Hackborn
81e56d535c Rework how we decide whether to use system or status bar.
The PhoneWindowManager is now responsible for determing this,
since it needs to do this before we can generate the configuration
since we need to take into account the system bar size we will use.

Also the Display should now report the screen height without
including the system bar.

Change-Id: I82dfcc5e327e4d13d82c373c6c870f557a99b757
2011-05-26 10:46:19 -07:00
Dianne Hackborn
80ef2a9745 am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2
* commit '42f8094c066209a65b09d53611ef5c93daba4c51':
  Spiffy new compatibility mode UI.
2011-05-26 10:00:00 -07:00
Kenny Root
1bb6cf18c0 Break apart queries to getInstalled* API DO NOT MERGE
To avoid blowing past the Binder IPC limit, change the
PackageManagerService to have a DB-like interaction where the client
tells the service the last "row" that it read.

The fact that we use a HashMap instead of a TreeMap makes this
problematic. For now we're just making a new ArrayList for the keys and
then sorting them for each call. This can make the API slower for callers
of this, but it's probably greatly overshadowed by the cost of the data
transfer itself.

Bug: 4064282
Change-Id: Ia3a8cdaa94581ed9336f2e05694b8c8a5f757bce
2011-05-26 09:53:24 -07:00
Dianne Hackborn
36cd41f8ef Spiffy new compatibility mode UI.
Change-Id: I1207eaafae59a434fcc979ad60a83e2d685288af
2011-05-25 21:08:37 -07:00
Dianne Hackborn
fee1c69a49 resolved conflicts for merge of 77dd616e to master
Change-Id: Idb7180177b01e7d822327ccc7c76617220860da2
2011-05-25 16:36:50 -07:00
Adam Powell
f8ac6b7394 Action bar tab layout
Sync with UX on action bar tab layout behavior.

Make action bar tabs behave better with configuration changes.

LinearLayout now supports largest child measurement in unspecified
mode.

Change-Id: Id520641715a61c07e64124a0c5a70912996c98a0
2011-05-25 11:55:56 -07:00
Dianne Hackborn
77dd616e68 am 00b3a5c6: am c404e9b2: Merge "More compatibility mode improvements." into honeycomb-mr2
* commit '00b3a5c65e6ef26056178d1d7473b921671752e9':
  More compatibility mode improvements.
2011-05-24 19:13:45 -07:00
Dianne Hackborn
00b3a5c65e am c404e9b2: Merge "More compatibility mode improvements." into honeycomb-mr2
* commit 'c404e9b20165f634904d1489216d17d8e09fe696':
  More compatibility mode improvements.
2011-05-24 19:10:53 -07:00
Dianne Hackborn
5be8de3420 More compatibility mode improvements.
We now correctly adjust display metrics, fixing for example issues
seen in Barcode Scanner.  In addition the decision about when to use
compatibility mode has a bug fixed where certain apps would not go
out of compatibility mode even though they should be able to.

Change-Id: I5971206323df0f11ce653d1c790c700f457f0582
2011-05-24 18:13:25 -07:00
Ying Wang
8f40e58712 Merge "Fix intermediate src dir for framework.jar" 2011-05-24 16:27:17 -07:00
Dianne Hackborn
e2c7715c77 resolved conflicts for merge of bbca8133 to master
Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6
2011-05-24 11:27:11 -07:00
Jeff Sharkey
a462079303 Observe screen on/off events in NetworkPolicy.
The POLICY_REJECT_BACKGROUND policy requires that network traffic be
blocked when a UID goes into the background.  Even if the UID has an
activity in the foreground, it's considered "background" if the screen
is turned off.

This changes watches for SCREEN_ON/OFF broadcasts, and rule generation
now observes screen state.  It also introduces an observer pattern so
that ActivityManager doesn't directly know about NetworkPolicy, and
moves the service management into SystemServer.

Change-Id: Ie7a84929d3ca60ae4578d47e19d5a8da10fd8d58
2011-05-23 18:39:56 -07:00
Dianne Hackborn
bbca81334e am 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2
* commit '4bb78889d04594c01a6af7f6d38c1764e9f575f9':
  Add "television" mode.
2011-05-23 16:16:54 -07:00
Dianne Hackborn
4bb78889d0 am 40277df7: Merge "Add "television" mode." into honeycomb-mr2
* commit '40277df7c33c0fc381eec589c768fe86de4b4404':
  Add "television" mode.
2011-05-23 16:07:43 -07:00
Dianne Hackborn
e360bb6bd8 Add "television" mode.
Change-Id: Ida1fdb61b036a8b489dbeda196fb4bc82e651b2b
2011-05-23 15:11:08 -07:00
Adam Powell
d0693bb603 am f2004180: am f5abccef: am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2
* commit 'f2004180f828584fa8525081a248e8c0f2055327':
  New opaque cab assets; search dialog tweaks.
2011-05-20 13:13:28 -07:00