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

90350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
9396f183c2 resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp 
Change-Id: I21512d61b5c08cee5fed69b34c3275ba5c3fc0d8
 2012-10-19 17:16:41 -07:00
Kenny Root
a5d29b2c14 am 9bef3294: Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev 
* commit '9bef3294d3660a85442829a25c9777e25d3c3cc8':
  Try to free cache before giving up on install
  Robustly add symlink and add for non-primary users
 2012-10-19 16:40:07 -07:00
Kenny Root
9bef3294d3 Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev 
* changes:
  Try to free cache before giving up on install
  Robustly add symlink and add for non-primary users
 2012-10-19 16:37:55 -07:00
Eric Laurent
4aed962612 am a09dd3a6: am 7e1664d4: Merge "New camera sounds" into jb-mr1-dev 
* commit 'a09dd3a6081b498476beddbbc2506f6d2be25a6b':
  New camera sounds
 2012-10-19 16:18:04 -07:00
Eric Laurent
a09dd3a608 am 7e1664d4: Merge "New camera sounds" into jb-mr1-dev 
* commit '7e1664d44be6174c772fc3d2dc8ef9f5f5824390':
  New camera sounds
 2012-10-19 16:15:39 -07:00
Eric Laurent
7e1664d44b Merge "New camera sounds" into jb-mr1-dev 2012-10-19 16:13:08 -07:00
Svetoslav Ganov
f46476cd15 am 19f2b16c: am 9823723d: Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev 
* commit '19f2b16cb6b4f488b31861e1f572ec4f71ffd69e':
  Cannot pan in browser if magnification is enabled.
 2012-10-19 14:53:23 -07:00
Svetoslav Ganov
19f2b16cb6 am 9823723d: Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev 
* commit '9823723d0f0bb47dfd3a6b251d7155dc1eb0918b':
  Cannot pan in browser if magnification is enabled.
 2012-10-19 14:50:02 -07:00
Svetoslav Ganov
9823723d0f Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev 2012-10-19 14:46:40 -07:00
Christopher Tate
9fffd565a9 am e9472f29: am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev 
* commit 'e9472f2937478ead4a5c2115ee69e508e4933417':
  Document immutable requirement of SharedPreferences return objects
 2012-10-19 14:43:50 -07:00
Christopher Tate
e9472f2937 am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev 
* commit '935415a050be75f582f632dd168be9fbb047137b':
  Document immutable requirement of SharedPreferences return objects
 2012-10-19 14:41:16 -07:00
Christopher Tate
935415a050 Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev 2012-10-19 14:38:05 -07:00
Christopher Tate
01ed79c578 Document immutable requirement of SharedPreferences return objects 
In particular, make it quite clear that the set returned by
getStringSet() must not be modfied by the app, period; and
add a similar caution about the map returned via getAll().

Also, fix a bug that could lead to unexpected data being committed
if the set instance passed to putStringSet() was mutated by the
app after that call (including mutations after commit() was
invoked).

Bug 7312641

Change-Id: If9a1be1b0669ac879ff7a7dc67a8805548ea10cc
 2012-10-19 13:43:52 -07:00
Adam Cohen
f9a3616bc9 am 7ff0fa48: am 6dad395c: Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev 
* commit '7ff0fa48c2e4ae7f0684f28d40e39852211f23a0':
  Fix transition into Recents with live wallpaper
 2012-10-19 13:22:57 -07:00
Adam Cohen
7ff0fa48c2 am 6dad395c: Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev 
* commit '6dad395ca8d5ff4ae278ac82a6de7a1ed2e36b49':
  Fix transition into Recents with live wallpaper
 2012-10-19 13:19:25 -07:00
Adam Cohen
6dad395ca8 Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev 2012-10-19 13:17:54 -07:00
Irfan Sheriff
93462385d4 am cacc4792: am 61e42262: Fix group join CTS test 
* commit 'cacc47920795ad0421f056004c03984a8e114b8b':
  Fix group join CTS test
 2012-10-19 12:43:21 -07:00
Irfan Sheriff
cacc479207 am 61e42262: Fix group join CTS test 
* commit '61e42262000549b78843f0959043fec8367ed189':
  Fix group join CTS test
 2012-10-19 12:40:40 -07:00
Irfan Sheriff
61e4226200 Fix group join CTS test 
Bug: 7379336
Change-Id: I20ead7e8c0d855be523bdfd8d9cb9eaa4b8fcac1
 2012-10-19 12:30:47 -07:00
Fabrice Di Meglio
e549a602a3 am af26ac31: am 398a6713: Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev 
* commit 'af26ac3130c0e956e28443d6e42212b02d4da611':
  Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
 2012-10-19 11:38:18 -07:00
Fabrice Di Meglio
af26ac3130 am 398a6713: Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev 
* commit '398a6713c355cf59af071e944268aec7c0096b5a':
  Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
 2012-10-19 11:36:12 -07:00
Fabrice Di Meglio
398a6713c3 Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev 2012-10-19 11:33:01 -07:00
Jeff Sharkey
45dec78cde am e4109957: am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev 
* commit 'e4109957ecaabf1e6843a4cde4dcfac9d37fef23':
  Parcel VpnProfile without using disk format.
 2012-10-19 11:18:22 -07:00
Jeff Sharkey
e4109957ec am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev 
* commit 'ba0372db366e63fa928ba83f3ad8c064c51ac8e0':
  Parcel VpnProfile without using disk format.
 2012-10-19 11:16:41 -07:00
Jeff Sharkey
ba0372db36 Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev 2012-10-19 11:12:59 -07:00
John Spurlock
01d2c64ab2 am 7404f28b: am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev 
* commit '7404f28b11e386a42b67ec8afcc9823f2bd03c2b':
  Frameworks base: Promote dream setting defaults to config.
 2012-10-19 11:05:23 -07:00
John Spurlock
7404f28b11 am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev 
* commit '8c82025650fdbcb2a80be03f8be6dbff430b678c':
  Frameworks base: Promote dream setting defaults to config.
 2012-10-19 11:02:40 -07:00
John Spurlock
8c82025650 Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev 2012-10-19 11:00:00 -07:00
Jeff Sharkey
6e7aa77565 Parcel VpnProfile without using disk format. 
The on-disk format of VpnProfile only stores the username/password
when saveLogin is set, which was dropping them across IPC boundaries.

Bug: 7378327
Change-Id: I30c16efb358ab8f8d3d9229bbf9811146fe034ce
 2012-10-19 10:48:11 -07:00
Romain Guy
be432fa01c am eb78cf53: am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824" into jb-mr1-dev 
* commit 'eb78cf538f87301c1612bf081ae2d5f93cae50f0':
  Defer layer rendering to avoid stalls Bug #7326824
 2012-10-19 10:45:41 -07:00
Romain Guy
eb78cf538f am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824" into jb-mr1-dev 
* commit '8b946c055ddd90cf79cd407c9f68a013d5d24c2a':
  Defer layer rendering to avoid stalls Bug #7326824
 2012-10-19 10:43:04 -07:00
Romain Guy
8b946c055d Merge "Defer layer rendering to avoid stalls Bug #7326824" into jb-mr1-dev 2012-10-19 10:40:28 -07:00
Justin Koh
e2c0feb536 am 75c61d83: Merge "Add appliance mode handling for WiFi Direct invitation dialog." into jb-mr1-aah-dev 
* commit '75c61d83bffcbbf9b0518cb034e078b640e2095f':
  Add appliance mode handling for WiFi Direct invitation dialog.
 2012-10-19 10:17:13 -07:00
Justin Koh
75c61d83bf Merge "Add appliance mode handling for WiFi Direct invitation dialog." into jb-mr1-aah-dev 2012-10-19 10:13:35 -07:00
Michael Jurka
833808d0c6 Fix transition into Recents with live wallpaper 
Fixes regression introduced by:
738cfc91053fc888397ec2d139e0798f8c95b3ca
(Fixing wallpaper flash when going in/out of Recents)
 2012-10-19 19:12:29 +02:00
Craig Mautner
59a9cc18f3 am 444354d2: am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev 
* commit '444354d2c62de37b65782f15c864af21086b4b04':
  Allow getDisplayContentLocked to return null...
 2012-10-19 09:32:19 -07:00
Craig Mautner
444354d2c6 am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev 
* commit '0ed07a0a30ef71053d0426956d3c198bb7540d4e':
  Allow getDisplayContentLocked to return null...
 2012-10-19 09:30:06 -07:00
Craig Mautner
0ed07a0a30 Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev 2012-10-19 09:27:06 -07:00
Michael Jurka
20124e4d5e am 9019335c: am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev 
* commit '9019335cd2daa896781f8d1ac67301f0f1b70ad9':
  Fixing wallpaper flash when going in/out of Recents
 2012-10-19 09:11:26 -07:00
Michael Jurka
d200e8987d am aee6cbd4: am 80343f64: Fix recents animations for secondary users 
* commit 'aee6cbd41546ca0fb85866ab1c8a865da727c19f':
  Fix recents animations for secondary users
 2012-10-19 09:11:22 -07:00
Michael Jurka
9019335cd2 am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev 
* commit 'e9687ba8bdccc27f98fe1dcdc48faac0c0de4c18':
  Fixing wallpaper flash when going in/out of Recents
 2012-10-19 09:09:06 -07:00
Michael Jurka
aee6cbd415 am 80343f64: Fix recents animations for secondary users 
* commit '80343f646f9686528212f82163a77ef48e30f4c3':
  Fix recents animations for secondary users
 2012-10-19 09:09:02 -07:00
Michael Jurka
e9687ba8bd Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev 2012-10-19 09:06:49 -07:00
John Spurlock
ed108f3d12 Frameworks base: Promote dream setting defaults to config. 
So that:
 - the values can be shared (to fix assoc bug)
 - the values can be customized in product overlays

Bug:7373284
Change-Id: I37f037082523a3d975f6014f36afa28c60117372
 2012-10-19 11:32:03 -04:00
Michael Jurka
738cfc9105 Fixing wallpaper flash when going in/out of Recents 
Bug: 7372516
Bug: 7216872

Change-Id: I2a2308a85caf9f2ad2d382c709e5f8867bd060be
 2012-10-19 16:58:50 +02:00
Michael Jurka
80343f646f Fix recents animations for secondary users 
Bug: 7361640

Change-Id: Ibd177bf01758fb8706b82dcf3bf234e052c38aa3
 2012-10-19 16:50:29 +02:00
Svetoslav Ganov
ff6c329f61 Cannot pan in browser if magnification is enabled. 
1. We cache some events to see if the user wants to trigger magnification. If no
   magnification is triggered we inject these events with adjusted time and down
   time to prevent subsequent transformations being confused by stale events.
   After the cached events, which always have a down, are injected we need to also
   update the down time of all subsequent non cached events.

bug:7379388

Change-Id: I41d8b831cc1016a0ee8f9c5ef5f42eb60a6f64d9
 2012-10-19 02:15:44 -07:00
Geremy Condra
2660fd2b5d am 01e99ada: am a1f739ea: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev 
* commit '01e99adaed17445ef01627fe841fc37f1f474d7b':
  Change android.permission.SERIAL_PORT to signature|system.
 2012-10-19 00:05:39 -07:00
Geremy Condra
01e99adaed am a1f739ea: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev 
* commit 'a1f739ea83b6d770b8469ae1c2c4161f6fe96334':
  Change android.permission.SERIAL_PORT to signature|system.
 2012-10-19 00:02:41 -07:00
Geremy Condra
a1f739ea83 Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev 2012-10-18 23:59:37 -07:00