104969 Commits

Author SHA1 Message Date
Dirk Dougherty
ddca710dc5 am 12d0071a: am 83d90b20: am ce2c3de7: am aac8d988: am 14ad06cf: am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks.
* commit '12d0071a658329088c8696a05cde764f425e6aba':
  Doc change: Add tablet basic checks.
2013-04-15 22:05:22 -07:00
Dirk Dougherty
12d0071a65 am 83d90b20: am ce2c3de7: am aac8d988: am 14ad06cf: am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks.
* commit '83d90b200babe43d5e91cef1bbcf0b224f48e16d':
  Doc change: Add tablet basic checks.
2013-04-15 22:03:10 -07:00
Dirk Dougherty
83d90b200b am ce2c3de7: am aac8d988: am 14ad06cf: am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks.
* commit 'ce2c3de716dd77db8f1280f939312c36ebd297ea':
  Doc change: Add tablet basic checks.
2013-04-15 21:59:53 -07:00
Dirk Dougherty
ce2c3de716 am aac8d988: am 14ad06cf: am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks.
* commit 'aac8d988e1f1863e51d3296f09373c2939137e09':
  Doc change: Add tablet basic checks.
2013-04-15 21:56:09 -07:00
Stan Chesnutt
83a68e042a am 464f4ea3: am b34b3211: Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode." into jb-mr2-dev
* commit '464f4ea35526863d489255c0493786f5d3e03f6f':
  Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode.
2013-04-15 21:55:21 -07:00
Daniel Sandler
1a0f755971 am 0a8ed3f2: am 4b6d23d7: Merge "Further reduce memory usage of notification archive." into jb-mr2-dev
* commit '0a8ed3f214ad9d4cd173cbffe6e712c395a108f6':
  Further reduce memory usage of notification archive.
2013-04-15 21:55:15 -07:00
Daniel Sandler
7c3d3f8b62 am 220fa85e: am f094d221: Merge "Finish annotating Notification.extras." into jb-mr2-dev
* commit '220fa85eac119fa51b1febbc4361afb4531f949b':
  Finish annotating Notification.extras.
2013-04-15 21:55:12 -07:00
Kristian Monsen
b414527095 am 46dedde9: am 639857f7: Merge "Fix for bug 8607049: Improve javascript dialogs for classic" into jb-mr2-dev
* commit '46dedde94e24d9b0785dc68f19fdf71eff68e631':
  Fix for bug 8607049: Improve javascript dialogs for classic
2013-04-15 21:54:57 -07:00
Kenny Root
738660894d am 49f0a5df: resolved conflicts for merge of 6a67a38f to jb-mr2-dev-plus-aosp
* commit '49f0a5df739d2da22f24ac14fe430adaffa13f3b':
  AndroidKeyStore: Add encrypted flag
2013-04-15 21:54:52 -07:00
David Christie
f63d3c64cb am e8ae4eaf: am feedb1b0: Merge "Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently." into jb-mr2-de
* commit 'e8ae4eafea69ccdffd91865f46ee2d569cdc1203':
  Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently.
2013-04-15 21:54:47 -07:00
Dianne Hackborn
a40d7e7cdc am 15717a32: am 0985ac04: Merge "Maybe fix issue #8620910: Win_sdk build failed and unable to create..." into jb-mr2-dev
* commit '15717a32c497895b294396c0000bc571790d3691':
  Maybe fix issue #8620910: Win_sdk build failed and unable to create...
2013-04-15 21:54:43 -07:00
Dianne Hackborn
11dfb30c2f am f5cfab41: am a59a19ab: Merge "Fix issue #8512015: VideoView\'s window animates when its position changes" into jb-mr2-dev
* commit 'f5cfab41c3ea1eb0cd99f7a9387af7df2b2e5991':
  Fix issue #8512015: VideoView's window animates when its position changes
2013-04-15 21:54:39 -07:00
Dirk Dougherty
aac8d988e1 am 14ad06cf: am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks.
* commit '14ad06cf2fc4b78182f6df4b4ebaa78453b68ff4':
  Doc change: Add tablet basic checks.
2013-04-15 21:52:26 -07:00
Dirk Dougherty
14ad06cf2f am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks.
* commit '25afd5d063b7f6bcb0f5d6bf93ac1015a5a89869':
  Doc change: Add tablet basic checks.
2013-04-15 21:49:14 -07:00
Dirk Dougherty
25afd5d063 am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks.
* commit 'd1dc8c70786fdeae1c0de39d4ded896663588203':
  Doc change: Add tablet basic checks.
2013-04-15 21:46:52 -07:00
Dirk Dougherty
d1dc8c7078 am c6af49ef: Doc change: Add tablet basic checks.
* commit 'c6af49efc467e379e7ac56246e9c7f0e6ebddc00':
  Doc change: Add tablet basic checks.
2013-04-15 21:43:56 -07:00
Dirk Dougherty
c6af49efc4 Doc change: Add tablet basic checks.
Change-Id: I9fab8f29515e086feffd45bcbcf9e7d6602a734d
2013-04-15 20:55:25 -07:00
Stan Chesnutt
464f4ea355 am b34b3211: Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode." into jb-mr2-dev
* commit 'b34b3211e01b0ae946f786b220f73d340159503b':
  Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode.
2013-04-15 19:52:52 -07:00
Stan Chesnutt
b34b3211e0 Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode." into jb-mr2-dev 2013-04-16 02:49:45 +00:00
Stan Chesnutt
1d72d8c33d Re-introduce single-shot mode, set MS Assist Mode A when in
single-shot mode.

Fixes bug http://b.corp.google.com/issue?id=8204392

Change-Id: I5594447c75abab6b71bd12706409666bb75736c5
2013-04-15 19:18:02 -07:00
Daniel Sandler
b5538e6421 Rebuild quick settings tile layouts.
The chief motivation here is to allow two lines of text when
necessary. So much refactoring over so small a thing, but
the result is satisfying: most quick settings tiles do not
need their own layouts. Additionally, tiles with odd-shaped
icons (I'm looking at you, alien potato mode) no longer fall
off the grid.

It should be possible to further reduce the complexity of
quick settings, but for now this will suffice.

Bug: 7216734 // vertical alignment issues
Bug: 7216868 // wrap text in QS tiles
Bug: 7365911 // NPE in some tiles
Change-Id: I0c6ef275e44f745dfac52c2a7303072ae48e3873
2013-04-15 22:09:55 -04:00
Daniel Sandler
0a8ed3f214 am 4b6d23d7: Merge "Further reduce memory usage of notification archive." into jb-mr2-dev
* commit '4b6d23d7b45f813bee52747b3243ce46ff9edbd0':
  Further reduce memory usage of notification archive.
2013-04-15 18:48:06 -07:00
Daniel Sandler
4b6d23d7b4 Merge "Further reduce memory usage of notification archive." into jb-mr2-dev 2013-04-16 01:44:11 +00:00
Daniel Sandler
5e62e3aa7d Further reduce memory usage of notification archive.
- Max 250 notifications preserved (was 1000)
- Known heavyweight extras are removed
- print some of 'em out in dumpstate, while we're at it

Bug: 8280039
Bug: 8537938
Change-Id: I9239128c32a1d9f5ef4e0dc62dc2d23e190871e9
2013-04-16 01:43:49 +00:00
Daniel Sandler
220fa85eac am f094d221: Merge "Finish annotating Notification.extras." into jb-mr2-dev
* commit 'f094d221e53e2359f886ae3d601c490ade70443e':
  Finish annotating Notification.extras.
2013-04-15 18:42:33 -07:00
Daniel Sandler
f094d221e5 Merge "Finish annotating Notification.extras." into jb-mr2-dev 2013-04-16 01:38:54 +00:00
Jesse Hall
58d80c53c0 Unhide android.opengl.GLES30 class and contents
Bug: 8566953
Change-Id: I5273fb3bff642da5ff1eecb5899e8051402b19ca
2013-04-15 17:38:36 -07:00
Jesse Hall
d830e74ff4 Add android.opengl.GLES30, hidden for now
Bug: 8566953
Change-Id: Ia5a01d5e857b4fce12a451e2dcab0359758ad648
2013-04-15 17:37:33 -07:00
Kristian Monsen
46dedde94e am 639857f7: Merge "Fix for bug 8607049: Improve javascript dialogs for classic" into jb-mr2-dev
* commit '639857f7f42bb048b1dd8fbc4849e7b51402f629':
  Fix for bug 8607049: Improve javascript dialogs for classic
2013-04-15 16:58:53 -07:00
Kristian Monsen
639857f7f4 Merge "Fix for bug 8607049: Improve javascript dialogs for classic" into jb-mr2-dev 2013-04-15 23:54:43 +00:00
Kenny Root
49f0a5df73 resolved conflicts for merge of 6a67a38f to jb-mr2-dev-plus-aosp 2013-04-15 16:40:04 -07:00
David Christie
e8ae4eafea am feedb1b0: Merge "Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently." into jb-mr2-dev
* commit 'feedb1b095f94e4bd153aeee78da07d963892071':
  Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently.
2013-04-15 16:39:08 -07:00
David Christie
feedb1b095 Merge "Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently." into jb-mr2-dev 2013-04-15 23:35:44 +00:00
Svetoslav
2602a3974a BinderDied may be called after we unregistered the death recipient.
It is possible that an accessibility service's package was force stopped
during whose handling the death recipient is unlinked and still get a call
on binderDied since the call was made before we unlink but was waiting on
the lock we held during the force stop handling. Added a check whether the
service is already disconnected and if so do nothing.

bug:8600388

Change-Id: I4a9ca305b9863d986b930a7c1ec8f9006b16a333
2013-04-15 16:30:12 -07:00
Dianne Hackborn
15717a32c4 am 0985ac04: Merge "Maybe fix issue #8620910: Win_sdk build failed and unable to create..." into jb-mr2-dev
* commit '0985ac04310f18be7dd814b9a07c93f144ad21c2':
  Maybe fix issue #8620910: Win_sdk build failed and unable to create...
2013-04-15 16:25:08 -07:00
Dianne Hackborn
f5cfab41c3 am a59a19ab: Merge "Fix issue #8512015: VideoView\'s window animates when its position changes" into jb-mr2-dev
* commit 'a59a19abb8f284beb478ff2492493251b91a2847':
  Fix issue #8512015: VideoView's window animates when its position changes
2013-04-15 16:25:05 -07:00
Dianne Hackborn
0985ac0431 Merge "Maybe fix issue #8620910: Win_sdk build failed and unable to create..." into jb-mr2-dev 2013-04-15 23:23:31 +00:00
Dianne Hackborn
a59a19abb8 Merge "Fix issue #8512015: VideoView's window animates when its position changes" into jb-mr2-dev 2013-04-15 23:22:48 +00:00
Geremy Condra
689db25e33 am baa58cdb: am bffe377b: Merge "Add logic to handle changes to file_contexts during update." into jb-mr2-dev
* commit 'baa58cdb9f7a230c224ffd3f3c519fa148d391e6':
  Add logic to handle changes to file_contexts during update.
2013-04-15 16:19:30 -07:00
Alan Viverette
b9f2e99f26 Send tab selection event from ScrollingTabContainerView.
BUG: 8185409
Change-Id: I37c59906d2950d09e0e39ca91ffad34279dd9526
2013-04-15 16:16:11 -07:00
Geremy Condra
baa58cdb9f am bffe377b: Merge "Add logic to handle changes to file_contexts during update." into jb-mr2-dev
* commit 'bffe377bca3cb8240bfc614c12fd1091ae3f69b9':
  Add logic to handle changes to file_contexts during update.
2013-04-15 16:13:56 -07:00
Geremy Condra
bffe377bca Merge "Add logic to handle changes to file_contexts during update." into jb-mr2-dev 2013-04-15 23:11:12 +00:00
Irfan Sheriff
caff13106d am 267b6029: am ed8cdbb7: Merge "Fix CTS failure due to invalid EAP update" into jb-mr2-dev
* commit '267b60295098ae27be651991bd1b50bf6db69032':
  Fix CTS failure due to invalid EAP update
2013-04-15 16:00:19 -07:00
Dirk Dougherty
5e55fb125b am e9cca7ea: am 9fbc8f70: am edf2ab16: am b345693f: am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy guidelines documents.
* commit 'e9cca7eae8354ff012c3ef87923a8435788547df':
  Doc change: add policy guidelines documents.
2013-04-15 16:00:16 -07:00
Irfan Sheriff
267b602950 am ed8cdbb7: Merge "Fix CTS failure due to invalid EAP update" into jb-mr2-dev
* commit 'ed8cdbb780cda3701b433dd1d383bb88f180ff72':
  Fix CTS failure due to invalid EAP update
2013-04-15 15:57:32 -07:00
Dirk Dougherty
e9cca7eae8 am 9fbc8f70: am edf2ab16: am b345693f: am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy guidelines documents.
* commit '9fbc8f70b6ccdecc95c968ecdb9f8f823bd92857':
  Doc change: add policy guidelines documents.
2013-04-15 15:57:29 -07:00
Irfan Sheriff
ed8cdbb780 Merge "Fix CTS failure due to invalid EAP update" into jb-mr2-dev 2013-04-15 22:52:33 +00:00
Dirk Dougherty
9fbc8f70b6 am edf2ab16: am b345693f: am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy guidelines documents.
* commit 'edf2ab16fe011667dbae8c6c351bd3ac36958326':
  Doc change: add policy guidelines documents.
2013-04-15 15:51:25 -07:00
Dirk Dougherty
edf2ab16fe am b345693f: am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy guidelines documents.
* commit 'b345693f0ff0705ba1eedd3b49c21d14dc78c6b6':
  Doc change: add policy guidelines documents.
2013-04-15 15:47:11 -07:00
Dirk Dougherty
b345693f0f am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy guidelines documents.
* commit '5a9c5b67ca6d8c35bb4522bd0618bf50f246f7ef':
  Doc change: add policy guidelines documents.
2013-04-15 15:44:46 -07:00