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

92767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
c2c4f8d895 am 50ad6326: am 466b77e9: am 2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev 
* commit '50ad6326c5814d092cf1510847bcdfb940a46738':
  New lockscreen: allow search gesture from nav bar.
 2012-10-22 08:07:05 -07:00
Daniel Sandler
50ad6326c5 am 466b77e9: am 2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev 
* commit '466b77e9951aa6dab0d721e1d9bfb805bb37ffc5':
  New lockscreen: allow search gesture from nav bar.
 2012-10-22 08:04:38 -07:00
Daniel Sandler
466b77e995 am 2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev 
* commit '2dd0c3a576925be4b5f0438a57af626e6e162e0e':
  New lockscreen: allow search gesture from nav bar.
 2012-10-22 08:02:32 -07:00
Daniel Sandler
2dd0c3a576 Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev 2012-10-22 07:59:18 -07:00
Amith Yamasani
0ad9356bdc am 283d1409: am f624d72c: am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev 
* commit '283d1409ddadd35cd41b5496659d3a24dc365fb0':
  Fix crashes when quickly adding and removing users
 2012-10-21 07:53:56 -07:00
Amith Yamasani
283d1409dd am f624d72c: am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev 
* commit 'f624d72cb0fe40fd5748d4f0d1a93bf267aa3ed8':
  Fix crashes when quickly adding and removing users
 2012-10-21 07:50:55 -07:00
Amith Yamasani
f624d72cb0 am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev 
* commit '8074e98b20ac04fdc032a1ed00dd6763b7e04147':
  Fix crashes when quickly adding and removing users
 2012-10-21 07:48:02 -07:00
Amith Yamasani
8074e98b20 Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev 2012-10-21 07:44:46 -07:00
Dirk Dougherty
8836ee3373 am 27b94b3e: am 746b6d46: am 7707b050: am 454248f0: am e25c241b: am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref. 
* commit '27b94b3eac1bec47d9a5141e44eb093c290e4ce8':
  Doc change: remove a few third-party refs. Fix broken image ref.
 2012-10-20 18:03:09 -07:00
Dirk Dougherty
27b94b3eac am 746b6d46: am 7707b050: am 454248f0: am e25c241b: am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref. 
* commit '746b6d462fd0eea294680a244602a81c3c993179':
  Doc change: remove a few third-party refs. Fix broken image ref.
 2012-10-20 18:00:17 -07:00
Dirk Dougherty
746b6d462f am 7707b050: am 454248f0: am e25c241b: am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref. 
* commit '7707b050f7f0f01819aaa6ccdafe0721c267fdeb':
  Doc change: remove a few third-party refs. Fix broken image ref.
 2012-10-20 17:57:58 -07:00
Dirk Dougherty
7707b050f7 am 454248f0: am e25c241b: am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref. 
* commit '454248f0d25cfb7e4131acca07a4c38acb74934d':
  Doc change: remove a few third-party refs. Fix broken image ref.
 2012-10-20 17:55:38 -07:00
Dirk Dougherty
454248f0d2 am e25c241b: am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref. 
* commit 'e25c241bddaf1e838b95c924976861733c7042bf':
  Doc change: remove a few third-party refs. Fix broken image ref.
 2012-10-20 17:52:41 -07:00
Dirk Dougherty
e25c241bdd am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref. 
* commit '6faae9ad08670c30379fed451e73171f7d1b6ac8':
  Doc change: remove a few third-party refs. Fix broken image ref.
 2012-10-20 17:51:00 -07:00
Dirk Dougherty
6faae9ad08 Doc change: remove a few third-party refs. Fix broken image ref. 
Change-Id: Ife1826f9c7d409e131b50e7178eba22f962d4219
 2012-10-20 17:47:18 -07:00
Fabrice Di Meglio
3c371b28ef am 0be6a28e: am 08f27b1b: am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev 
* commit '0be6a28ed5f27217d66c69195524d8747a6975bc':
  Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
 2012-10-19 19:22:05 -07:00
Fabrice Di Meglio
0be6a28ed5 am 08f27b1b: am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev 
* commit '08f27b1bffbf01d9e5a102b8c90a3c2095fc82b3':
  Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
 2012-10-19 19:19:00 -07:00
Fabrice Di Meglio
08f27b1bff am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev 
* commit '59420ecd1518289cc47c32181250539c981f85f0':
  Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
 2012-10-19 19:17:06 -07:00
Fabrice Di Meglio
59420ecd15 Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev 2012-10-19 19:14:30 -07:00
Fabrice Di Meglio
d3156a2a56 Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO 
This was a regression introduced by a previous CL.

- we actually need to let the layout params resolution goes all the time
as we dont have any "isResolved" state and a public API for doing its reset thru ViewGroup.

The current implementation is simple and works even if it is doing sometimes a bit more
than it should really do. This is a well conscious tradeoff.

Change-Id: I5c4d532331b3970dfe88f016bc305cbc4a0d83f1
 2012-10-19 18:46:43 -07:00
Kenny Root
a7fb9d907c am 9396f183: resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp 
* commit '9396f183c2db5d6167f39a8d5667fb4abcc96e5e':
  Try to free cache before giving up on install
  Robustly add symlink and add for non-primary users
 2012-10-19 17:20:03 -07:00
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
Amith Yamasani
db6a14cc85 Fix crashes when quickly adding and removing users 
Make USER_REMOVED an ordered broadcast and send it before the user's
state is completely removed from the system. This gives services the
opportunity to clean up their state, while still having access to the
user's directory and UserInfo object (such as serial number).

Tell SyncManager to skip over dying/partially created users.

Improve UserManager tests, waiting for users to be removed fully.

Bug: 7382252

Change-Id: I93cfb39c9efe6f15087bf83c569a2d154ef27168
 2012-10-19 16:23:30 -07:00
Eric Laurent
ea064e1b1f am 4aed9626: am a09dd3a6: am 7e1664d4: Merge "New camera sounds" into jb-mr1-dev 
* commit '4aed962612413d506f4682c1de8c9f3cfc453d60':
  New camera sounds
 2012-10-19 16:21:14 -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
Tim Murray
c7f5092f33 Merge "Remove copyBitmap from ImageProcessing." 2012-10-19 15:30:35 -07:00
Svetoslav Ganov
5ce3b47fe1 am f46476cd: am 19f2b16c: am 9823723d: Merge "Cannot pan in browser if magnification is enabled." into jb-mr1-dev 
* commit 'f46476cd154a4cf81c9d756a6dbc2330f04adf80':
  Cannot pan in browser if magnification is enabled.
 2012-10-19 14:55:55 -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
Christopher Tate
58fc8e5ada am 9fffd565: am e9472f29: am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev 
* commit '9fffd565a927f03d10c2009b741e7222ddd4967e':
  Document immutable requirement of SharedPreferences return objects
 2012-10-19 14:46:48 -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
Daniel Sandler
d5483c3157 New lockscreen: allow search gesture from nav bar. 
Show a lights-out pip if home is invisible but search is
still OK.

Change-Id: Ifc69c12296cc8e8cf7c89dd06173d7abf499a878
 2012-10-19 16:48:12 -04: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
Alon Albert
7b78f5001a Merge "Add sync reason to dumpsys" 2012-10-19 13:43:16 -07:00
Adam Cohen
bd00735d35 am f9a3616b: am 7ff0fa48: am 6dad395c: Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev 
* commit 'f9a3616bc9267cd13a1804d8350ba49a1581a28d':
  Fix transition into Recents with live wallpaper
 2012-10-19 13:26:55 -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
Irfan Sheriff
5d3f8edf97 am 93462385: am cacc4792: am 61e42262: Fix group join CTS test 
* commit '93462385d4e1515a7011b7d1df54ebbd901bab8c':
  Fix group join CTS test
 2012-10-19 13:22:27 -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
Fabrice Di Meglio
da391700c9 resolved conflicts for merge of e549a602 to master 
Change-Id: I37dc0e48321d4baea49d77b6ef22bca19dcb0d9b
 2012-10-19 12:49:30 -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
Alon Albert
57286f9706 Add sync reason to dumpsys 
Also:
 * add a second history section that logs
 * log mesg as text instead of number
 * dump Sync Status as a table

 Sample log:
Recent Sync History
  #1  : 2012-10-11 15:06:11     USER    0.4s            aagmtest1@gmail.com/com.google u0  com.android.calendar                                  com.google.android.calendar
  #2  : 2012-10-11 15:06:11     USER    0.1s            aagmtest1@gmail.com/com.google u0  subscribedfeeds                                       android.uid.system:1000
    mesg=parse-error
  #3  : 2012-10-11 15:06:11     USER    0.0s            aagmtest1@gmail.com/com.google u0  com.google.android.apps.uploader.PicasaUploadProvider android.uid.system:1000
  #4  : 2012-10-11 15:06:10     USER    0.1s            aagmtest1@gmail.com/com.google u0  com.google.android.gms.plus.action                    android.uid.system:1000

Recent Sync History Extras
  #1  : 2012-10-11 15:06:11     USER   aagmtest1@gmail.com/com.google u0  com.android.calendar                                  Bundle[{feed=aagmtest1@gmail.com, force=true, ignore_settings=true, ignore_backoff=true}]
  #2  : 2012-10-11 15:06:11     USER   aagmtest1@gmail.com/com.google u0  subscribedfeeds                                       Bundle[{ignore_backoff=true, force=true, ignore_settings=true}]
  #3  : 2012-10-11 15:06:11     USER   aagmtest1@gmail.com/com.google u0  com.google.android.apps.uploader.PicasaUploadProvider Bundle[{ignore_backoff=true, force=true, ignore_settings=true}]
  #4  : 2012-10-11 15:06:10     USER   aagmtest1@gmail.com/com.google u0  com.google.android.gms.plus.action                    Bundle[{ignore_backoff=true, force=true, ignore_settings=true}]

Sync Status
Account aagmtest1@gmail.com u0 com.google
=======================================================================
Authority                                           Syncable  Enabled  Delay  Loc  Poll  Per  Serv  User  Tot  Time  Last Sync            Periodic
-------------------------------------------------------------------------------------------------------------------------------------------------------------
com.google.android.apps.currents                    1         true            0    2     1    2     1     6    0:35  PERIODIC SUCCESS     86400
                                                                                                                     2012-10-12 14:59:40  2012-10-13 14:58:13
com.google.android.music.MusicContent               1         true            0    0     1    2     1     4    0:09  PERIODIC SUCCESS     86400
                                                                                                                     2012-10-12 14:59:18  2012-10-13 14:58:13
com.google.android.gms.plus.action                  1         true            0    0     1    1     1     3    0:00  PERIODIC SUCCESS     86400
                                                                                                                     2012-10-12 14:59:15  2012-10-13 14:58:13
com.google.android.apps.magazines                   1         true            0    1     1    2     1     5    0:14  PERIODIC SUCCESS     86400
                                                                                                                     2012-10-12 14:59:00  2012-10-13 14:58:13

Change-Id: Iffeb825e4b4f6217940a39b0dd71e06856f08f3f
 2012-10-19 12:39:27 -07:00