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

1565 Commits

Author SHA1 Message Date
Dianne Hackborn
3fe9cc5ea6 resolved conflicts for merge of e95c07bd to master 
Change-Id: I9af0c08a9f1c1f68661efe051a66835e850b76f6
 2011-06-14 16:13:26 -07:00
Dianne Hackborn
e95c07bd8a am 7c7f8e18: am 0a8a2324: Merge "Fix issue #4603422: Compatibility mode button doesn\'t always update" into honeycomb-mr2 
* commit '7c7f8e18dee8b582ec8e30a1412903ceec2ef5f5':
  Fix issue #4603422: Compatibility mode button doesn't always update
 2011-06-14 15:22:12 -07:00
Dianne Hackborn
7c7f8e18de am 0a8a2324: Merge "Fix issue #4603422: Compatibility mode button doesn\'t always update" into honeycomb-mr2 
* commit '0a8a2324239d7604e2a68349585aa67b59b25f4c':
  Fix issue #4603422: Compatibility mode button doesn't always update
 2011-06-14 15:14:34 -07:00
Dianne Hackborn
7d04932ef5 Fix issue #4603422: Compatibility mode button doesn't always update 
We now tell the system bar every time the top activity has changed for
it to re-evaluate its UI state.

Also fix issue #: 4607102 Low rider notifications.  It turns out this
was due to the change in the dialog asset; the notification UI was relying
on this having a lot of padding to make it sit above the status bar.
Now we have an explicitly mechanism to set how much it overlaps (or doesn't)
the status bar.

Change-Id: Iab5ebd86e620ff4fc4cd77206e18af962ec2830e
 2011-06-14 15:05:16 -07:00
Jeff Brown
3e234ba1fb Merge "Allow touches to slide out of the navigation bar." 2011-06-13 20:30:09 -07:00
Mike Lockwood
fa77931784 Merge "Settings: Remove unused USE_PTP_INTERFACE setting" 2011-06-13 19:50:37 -07:00
Mike Lockwood
1324f22d8d Settings: Remove unused USE_PTP_INTERFACE setting 
Change-Id: I743b81379053caece38c19c59bc76d6cda763d45
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-13 22:21:01 -04:00
Jeff Brown
98db5fabda Allow touches to slide out of the navigation bar. 
Change-Id: I73cabba3d62f47829bf6217700ace56a27c42b1d
 2011-06-13 18:05:18 -07:00
Daniel Sandler
08d08f667e Use the new animated notification layout on tablets. 
(See change Ib46b2d3e.)

Change-Id: I46635ed97596bf1ebe65cd29ef80f3b189102d8a
 2011-06-13 10:28:28 -04:00
Daniel Sandler
d42497e516 Rebuilt notification list using a new custom layout. 
This will allow what is currently impossible with
layoutTransition: smoothly animating container bounds.

Current enter animation: alpha fade
Current exit animation: fade + slide right

Change-Id: Ib46b2d3ee982a276ca2142d360e62538e52b0897
Next: replace "X" with swipe-to-cancel.
 2011-06-12 00:11:09 -04:00
Dianne Hackborn
6b592723c9 resolved conflicts for merge of f51ded0f to master 
Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2
 2011-06-10 12:45:36 -07:00
Dianne Hackborn
7bbf6f7d11 am 8297f669: am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2 
* commit '8297f669356ee997c5faa745815e8b9a7009fba7':
  Fix for not reporting correct "sw" in compat mode.
 2011-06-09 18:42:55 -07:00
Dianne Hackborn
f51ded0f8f am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 
* commit 'a8d7ea067cf22baeee2ff0a33e5a8c5a35936942':
  Enforce public resource restriction on bag parents.
 2011-06-09 16:06:07 -07:00
Dianne Hackborn
a8d7ea067c am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 
* commit '220cd77de62956eb76c5084e1d1341d69bfd214a':
  Enforce public resource restriction on bag parents.
 2011-06-09 16:02:02 -07:00
Dianne Hackborn
426431adcc Enforce public resource restriction on bag parents. 
Need to put some more styles in the SDK to avoid breaking apps.

Also, welcome Android 3.2.

Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
 2011-06-09 15:27:39 -07:00
Wink Saville
0231804095 am 0da86d4f: am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE 
* commit '0da86d4fef70f94a02a504f8500df2833719da6b':
  Fix default preferred network.
 2011-06-09 11:55:30 -07:00
Dianne Hackborn
8297f66935 am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2 
* commit '3aabdeaceff8405406d90c329a6691552559556d':
  Fix for not reporting correct "sw" in compat mode.
 2011-06-08 22:38:03 -07:00
Dianne Hackborn
3aabdeacef am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2 
* commit '5ba2e872fa684c0f1b992a95df00854b58f2cd8c':
  Fix for not reporting correct "sw" in compat mode.
 2011-06-08 22:35:25 -07:00
Dianne Hackborn
48a7651823 Fix for not reporting correct "sw" in compat mode. 
Change-Id: Ia225c94b36ccc3589d417aafd5680247678eddfd
 2011-06-08 22:26:33 -07:00
Chia-chi Yeh
b539f8d7d5 Merge "The UI part of the user space VPN support." 2011-06-08 14:17:44 -07:00
Wink Saville
0da86d4fef am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE 
* commit 'a558fdf156601a477964139fee57da29de7f31b3':
  Fix default preferred network.
 2011-06-08 12:59:37 -07:00
Wink Saville
a558fdf156 Merge "Fix default preferred network." into honeycomb-LTE 2011-06-08 12:56:27 -07:00
Wink Saville
d6bcfd1cd0 Fix default preferred network. 
Also, for xoom-cdma-lte devices CdmaLteServiceStateTracker#getOtasp
returns OTASP_NOT_NEEDED.

Some cleanup.


Bug: 4531115
Change-Id: I24b160062eda625ff5c3471399b9e83ae0d2869a
 2011-06-08 12:18:07 -07:00
Robert Greenwalt
7579081297 am 31ced5c1: am 350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE 
* commit '31ced5c140cae9b3ad90066a540346acd821a3c9':
  Fix NPE in the statusbar.
 2011-06-07 17:54:17 -07:00
Dianne Hackborn
891266e36e am b5b98f87: am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2 
* commit 'b5b98f877a09907a9a3b0c7e590e6e0ddd575158':
  DO NOT MERGE. Experimental compatibility mode UI.
 2011-06-07 15:52:38 -07:00
Dianne Hackborn
b5b98f877a am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2 
* commit 'dfe824ef3e5d8b2adac97c667cd51c7dfdb3c7af':
  DO NOT MERGE. Experimental compatibility mode UI.
 2011-06-07 15:39:43 -07:00
Christopher Tate
0a251cd5ee Merge "Don't ack/nak backup redundantly at exit" 2011-06-07 15:37:08 -07:00
Christopher Tate
ec5d4a0f97 Don't ack/nak backup redundantly at exit 
Change-Id: I7293518bc2fe6c66270a7c8aea3bf0c0829754e4
 2011-06-07 15:35:45 -07:00
Daniel Sandler
56e6dbd8b1 DO NOT MERGE. Experimental compatibility mode UI. 
♫ Just another button, for you and me, in the status bar. ♫

(cherry picked from commit 45c0401a0647a5fdc5f37168463c14ad57c5644b)

Change-Id: Ib35d136deadf16f693003b61ea6cfee411f4aa3d
 2011-06-07 14:11:09 -07:00
Daniel Sandler
18cee202a0 Merge "Experimental compatibility mode UI." 2011-06-07 13:37:08 -07:00
Daniel Sandler
45c0401a06 Experimental compatibility mode UI. 
♫ Just another button, for you and me, in the status bar. ♫

Change-Id: I11ecac63341d4c421dbaffba931861605ebad286
 2011-06-07 15:29:07 -04:00
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
Robert Greenwalt
31ced5c140 am 350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE 
* commit '350b78291de725a1607395055b6d28655d9e1080':
  Fix NPE in the statusbar.
 2011-06-07 11:01:23 -07:00
Robert Greenwalt
acab04dfc1 Fix NPE in the statusbar. 
Happens for some reason when switching between LTE and CDMA.  Filing separate
bug about why we see the null ServiceState in that case, but it revealed
this one use which wasn't checked for null.

bug:4518551
Change-Id: If8f9a89658a7165d79f96cad7d99cbf670e96ae7
 2011-06-06 17:16:45 -07:00
Eric Fischer
e34ed24f4d am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'e9d32283e4eca1ee27218ed66f754a694678ac6d':
  Import revised translations.  DO NOT MERGE
 2011-06-06 11:50:16 -07:00
Eric Fischer
e9d32283e4 am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'b16b020dd32147fbaaf7de47d5de16bfee10967a':
  Import revised translations.  DO NOT MERGE
 2011-06-06 10:54:41 -07:00
Christopher Tate
d00ea44b31 Merge "Respect android:allowBackup="false" during full backup & restore" 2011-06-03 17:39:27 -07:00
Eric Fischer
b5c6212de1 Import revised translations. DO NOT MERGE 
Change-Id: I4bfd9ec60da3b224c71406851f0a7f8bbf0c1120
 2011-06-03 17:24:55 -07:00
Chia-chi Yeh
19f054b0f6 The UI part of the user space VPN support. 
Change-Id: Ia9b7d516f977bc0fa7c30f44ff8111466838d1aa
 2011-06-03 17:06:29 -07:00
Jeff Brown
7218d830e2 resolved conflicts for merge of ca2b552d to master 
Change-Id: I2f3693a59042ac5aa2d7bcdc3a504c78dc99a18b
 2011-06-03 15:50:27 -07:00
Dianne Hackborn
678d344bcb resolved conflicts for merge of b9e2f68b to master 
Change-Id: Icb68aee4c68170f0e7cd7854dbaa61656a349142
 2011-06-03 14:15:10 -07:00
Christopher Tate
a858cb075d Respect android:allowBackup="false" during full backup & restore 
Packages with this manifest attribute set 'false' will not be backed
up even through the "full device backup" infrastructure.  If someone
produces an apparent restore file with data for such an application,
it will not actually be restored onto the device.

When an apk is installed during the course of a restore operation,
it is validated against the manifest contents and deleted if there
is a mismatch.  Also, if the newly-installed app is found to
disallow backups, no file content will be processed for that app.

Bug 4532159

Change-Id: I59630054584b1394e567de939192e22e597044ee
 2011-06-03 14:06:46 -07:00
Eric Fischer
3124e6ebe7 Merge "Import revised translations." 2011-06-03 10:22:58 -07:00
satok
3fc1f85a37 resolved conflicts for merge of 7e2181c0 to master 
Change-Id: Ifc3efad0c8ccf9bb880f53eeced39a5a91344af0
 2011-06-03 10:26:15 +09:00
Jeff Brown
ca2b552d98 am c8812761: am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2 
* commit 'c8812761609e532cceb400b112ed9982149c2490':
  Add a preference panel for mouse speed.
 2011-06-02 17:34:03 -07:00
Jeff Brown
c881276160 am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2 
* commit 'e1718de61c20c8d401633f83589f18d2c0c652db':
  Add a preference panel for mouse speed.
 2011-06-02 17:28:07 -07:00
Eric Fischer
95cab5414d Import revised translations. 
Change-Id: Iffa8d66bf709a6daa6a3cd464ac55b6e34857d71
 2011-06-02 16:54:11 -07:00
Jeff Brown
1a84fd1fb7 Add a preference panel for mouse speed. 
Bug: 4124987
Change-Id: I3ce175d268a1d043cf5878481261b1049a15a149
 2011-06-02 15:39:21 -07:00
Dianne Hackborn
ed60f81940 resolved conflicts for merge of 76450622 to master 
Change-Id: I26ccd8f264e65f100d894f43cf597a781552db83
 2011-06-02 09:20:52 -07:00
satok
cc28a669f6 Merge "Add an api to get the display name for InputMethodSubtype" 2011-06-02 02:34:32 -07:00