Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,864 Commits 3 Branches 0 Tags
103dbdc5a6d61d4a47c6308cf0345e90ddbced23
Commit Graph

29146 Commits

Author SHA1 Message Date
Raph Levien
103dbdc5a6 am fdf26397: am 9defd066: am 74437532: Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev 
* commit 'fdf263971b3bbc93d743195e840967063ccf5fcb':
  Fix for bug: Gmail (and other places): cursor placed on top of letter
 2012-10-22 16:04:12 -07:00
Raph Levien
fdf263971b am 9defd066: am 74437532: Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev 
* commit '9defd0663e2b6a486f5bc72621bbbd4dfab666fb':
  Fix for bug: Gmail (and other places): cursor placed on top of letter
 2012-10-22 16:01:39 -07:00
Raph Levien
9defd0663e am 74437532: Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev 
* commit '74437532fe2a3e9ebd15c61327fd3f2b68c299b3':
  Fix for bug: Gmail (and other places): cursor placed on top of letter
 2012-10-22 15:59:22 -07:00
Raph Levien
74437532fe Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev 2012-10-22 15:56:01 -07:00
Raph Levien
42ef515d18 Fix for bug: Gmail (and other places): cursor placed on top of letter 
This patch fixes bug 7346656. In this particular case, the text line in
the EditText was split into multiple spans, with the boundary between
the "r" and "," in "r,". These were being drawn as two separate runs,
but measured as a single run, leading to inconsistent measurements
because this is a kern pair in Roboto.

The fix is to eliminate the special-case code for measuring. This will
actually improve efficiency, as the value computed in one pass is now
more likely to be reused in another.

Change-Id: I04142a0ec98f280fc1027c7cbdbf903e3096f8e4
 2012-10-22 15:01:17 -07:00
Jamie Gennis
e8c18cb36b am 5bbfcd3e: am 9fee7bd7: am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev 
* commit '5bbfcd3e15048f94310da6cba85be8ab047c0e8b':
  Set the secureness when creating displays
 2012-10-22 13:57:55 -07:00
Jamie Gennis
5bbfcd3e15 am 9fee7bd7: am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev 
* commit '9fee7bd73d1231172267cde99d2374cf072c2dca':
  Set the secureness when creating displays
 2012-10-22 13:54:53 -07:00
Jamie Gennis
9fee7bd73d am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev 
* commit '23d622418b5c67dc43faabd930d1c59c5ce34f6a':
  Set the secureness when creating displays
 2012-10-22 13:52:12 -07:00
Jamie Gennis
23d622418b Merge "Set the secureness when creating displays" into jb-mr1-dev 2012-10-22 13:49:35 -07:00
Amith Yamasani
6861a6147c am e78d50b4: am 6eb9844c: am 22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev 
* commit 'e78d50b4a02a8242a99dea4cfacee2a7c9e7f122':
  System server should always send broadcasts to a specific or all users
 2012-10-22 13:40:12 -07:00
Amith Yamasani
e78d50b4a0 am 6eb9844c: am 22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev 
* commit '6eb9844c8e4ff36ebb58a9e5223e69adea1156cf':
  System server should always send broadcasts to a specific or all users
 2012-10-22 13:37:19 -07:00
Amith Yamasani
6eb9844c8e am 22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev 
* commit '2278898126c1cea4bd345bb96313d381b4ad3993':
  System server should always send broadcasts to a specific or all users
 2012-10-22 13:35:21 -07:00
Amith Yamasani
2278898126 Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev 2012-10-22 13:32:24 -07:00
Amith Yamasani
cd75706117 System server should always send broadcasts to a specific or all users 
Bug: 7368245

Log a warning if the system process calls unqualified sendBroadcast()
and other calls.

As a result of the logging above, found a few more method calls such as
bindService() that would benefit from being more explicit to avoid
future confusion and reduce the log warnings.

Change-Id: I17f15c8be9adf7becd456d6abbab606f19befdbf
 2012-10-22 12:38:53 -07:00
Adam Powell
c5b9ea70b9 am f4c6a4e4: am cad6dce5: am cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev 
* commit 'f4c6a4e42e11a8bf829335426d67be92b0e7ab5c':
  Remove View's long press callbacks when ACTION_CANCEL is received
 2012-10-22 12:37:34 -07:00
Adam Powell
f4c6a4e42e am cad6dce5: am cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev 
* commit 'cad6dce59653bf0a5ad015ab936948497f58b3b4':
  Remove View's long press callbacks when ACTION_CANCEL is received
 2012-10-22 12:34:18 -07:00
Adam Powell
cad6dce596 am cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev 
* commit 'cd92db84c6d9e0c9992abfbbda45d504c7f5e062':
  Remove View's long press callbacks when ACTION_CANCEL is received
 2012-10-22 12:31:35 -07:00
Adam Powell
5311c4476e Remove View's long press callbacks when ACTION_CANCEL is received 
Bug 7391646

Change-Id: Icd100d3eff63a54c892367fb70dec517257a01f8
 2012-10-22 12:15:49 -07:00
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
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
Jamie Gennis
7bbf8163fb Set the secureness when creating displays 
This change makes use of the new 'secure' argument to the
ISurfaceComposer::createDisplay method.  In this change both the overlay and
wifi displays are hard-coded to be non-secure displays.

Bug: 7368436
Change-Id: Ib65312f2adab5104d8deefbfc32af9dc106a9129
 2012-10-19 18:34:35 -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
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
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
Fabrice Di Meglio
da391700c9 resolved conflicts for merge of e549a602 to master 
Change-Id: I37dc0e48321d4baea49d77b6ef22bca19dcb0d9b
 2012-10-19 12:49:30 -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
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
ca1a3171ba am 45dec78c: am e4109957: am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev 
* commit '45dec78cde513f0a2e309e548eb2f0df3b0b7497':
  Parcel VpnProfile without using disk format.
 2012-10-19 11:21:27 -07:00