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
Kenny Root
6a67a38f46
Merge "AndroidKeyStore: Add encrypted flag"
2013-04-15 22:44:41 +00:00
Dirk Dougherty
5a9c5b67ca
am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy guidelines documents.
...
* commit 'b02d529a2faaca629e7c51e4c4ccd7fe34ddb376':
Doc change: add policy guidelines documents.
2013-04-15 15:41:56 -07:00
Dirk Dougherty
b02d529a2f
am 6859939f: am 99a79e80: Doc change: add policy guidelines documents.
...
* commit '6859939fe88de8b42117a3d0798dccb0c594e568':
Doc change: add policy guidelines documents.
2013-04-15 15:37:56 -07:00
Dianne Hackborn
c51d050f1b
Maybe fix issue #8620910 : Win_sdk build failed and unable to create...
...
...the sdk platform repo
Change-Id: Ib6cd7c0dfb9b6217ae79af3e2ac25fe0442996e3
2013-04-15 15:36:53 -07:00
Irfan Sheriff
0b132962e4
Fix CTS failure due to invalid EAP update
...
Update EAP only when it has valid entry
Bug: 8604987
Change-Id: Ib6b10bd06c26ee91c4ecd3a231b509d728725dfc
2013-04-15 22:36:45 +00:00
Dirk Dougherty
6859939fe8
am 99a79e80: Doc change: add policy guidelines documents.
...
* commit '99a79e807b4bab154c9904a05d05dda4b420206a':
Doc change: add policy guidelines documents.
2013-04-15 15:34:08 -07:00
Kenny Root
7105ad6d6b
am 4b1042e7: am 2570d0ad: Merge "keystore: remove old APIs" into jb-mr2-dev
...
* commit '4b1042e765f98c1437363b30b310f9bf35c92dc1':
keystore: remove old APIs
2013-04-15 15:32:47 -07:00
David Christie
1b9b7b1f1b
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.
Change-Id: Ibd9ce28b0401372b995a0dbfb2f0a984dd11c0b1
2013-04-15 15:31:11 -07:00
Kenny Root
4b1042e765
am 2570d0ad: Merge "keystore: remove old APIs" into jb-mr2-dev
...
* commit '2570d0ada876b94a91f9665c7469140ba0ddc712':
keystore: remove old APIs
2013-04-15 15:30:05 -07:00
Kenny Root
2570d0ada8
Merge "keystore: remove old APIs" into jb-mr2-dev
2013-04-15 22:25:21 +00:00
Chet Haase
face742d31
Avoid repositioning unattached overlay views
...
Adding a view to an overlay usually entails removing the
view from its current parent, if it has one. ViewOverlay.add() will
do this automatically. At the same time, it will check to see whether
the parent view is in a different global location than the overlay's
host view, and will adjust the added view accordingly. This enables
the caller to simply toss a view into an overlay and have it end up
at the same global position on the screen.
the problem is that the current code doesn't bother to check whether
the old parent is attached. If that parent has been removed from the
view hierarchy before this overlay operation, then it will show up as
being at (0,0) in the window, not its old location. This results in the
view being mis-positioned in the overaly.
Fix is simple: if the view's old parent is not attached, simply remove
it from that parent before adding it to the overlay; don't try to compensate
for its position which is based on wrong information.
Issue #8620319 Overlay should only use relative window locations for onscreen parents
Change-Id: I414038a6c355dfd58f9766b007ac44d535ef1889
2013-04-15 15:15:59 -07:00
Dianne Hackborn
1c5383ce0b
Fix issue #8512015 : VideoView's window animates when its position changes
...
Change-Id: I79eee6b9672b7d72eabe5d20be639c05a6f3d72b
2013-04-15 15:07:21 -07:00
Svetoslav
1f3d844add
am 7919ea98: am 7af3d056: Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-dev
...
* commit '7919ea98668abe3782f00f78cc48fc1ed011c49e':
Crash on non-eng builds due to lacking null check.
2013-04-15 15:00:00 -07:00
Svetoslav
ed8998094a
am f9dd9338: am 289e6497: Merge "Fully setup newly bound service before state management." into jb-mr2-dev
...
* commit 'f9dd9338d0849aaf9c5a4b4905a3884787685fa4':
Fully setup newly bound service before state management.
2013-04-15 14:59:57 -07:00
Geremy Condra
f33575b05b
Add logic to handle changes to file_contexts during update.
...
Bug: 8116902
(cherry picked from commit a2dffda3b3bc4f0bccb175ef4569e45a221d0eb2)
Change-Id: I57c21681d5f94e00d0214fb520ea62af4ea5b025
2013-04-15 14:56:58 -07:00
Svetoslav
7919ea9866
am 7af3d056: Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-dev
...
* commit '7af3d0560d130e877e6ce6a1c830efa7a945d436':
Crash on non-eng builds due to lacking null check.
2013-04-15 14:56:24 -07:00
Svetoslav
f9dd9338d0
am 289e6497: Merge "Fully setup newly bound service before state management." into jb-mr2-dev
...
* commit '289e64974a3be70ff823ee0a0c1fe5ea32a832bb':
Fully setup newly bound service before state management.
2013-04-15 14:56:21 -07:00
Svetoslav
7af3d0560d
Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-dev
2013-04-15 21:52:07 +00:00
Svetoslav
289e64974a
Merge "Fully setup newly bound service before state management." into jb-mr2-dev
2013-04-15 21:51:22 +00:00