OSDN Git Service
Oren Blasberg [Tue, 8 Sep 2015 21:59:12 +0000 (14:59 -0700)]
Cascading popup menus: open submenu on mouse hover.
When the cascading feature is enabled, users can mouseover a
submenu item in a popup menu to expand and open the new submenu
(after a short timeout). Similarly, if a user mouseovers a
different menu item in the original menu, the submenu gets closed
(again, after a short timeout).
This should complete the implementation of cascading submenu
functionality.
Also fix two other issues:
(1) Update some oudated code in PopupMenu that was still opening
the submenu when a user clicks on a submenu item; this
responsibility now lives within the MenuPopupHelper's delegate
MenuPopup class, so it doesn't need to live in PopupMenu anymore.
(2) Fix an issue where icons would be force-set on a submenu when they
should not be. Instead, decide whether to show icons in a submenu
based on whether to show them in the top level menu, as intended.
Bug:
20127825
Change-Id: Ia46852c7f99436065ab4bc234de94dffc0019666
Oren Blasberg [Thu, 10 Sep 2015 21:37:26 +0000 (14:37 -0700)]
Fix broken popup menu in Shelf (andromeda).
This addresses a few oversights from an earlier CL:
1. In MenuPopupHelper#show() make sure to create a new MenuPopup in
case the earlier one was dismissed.
2. Ensure the on-dismiss listener gets called even if the MenuPopupHelper's
MenuPopup was previously closed and if a new one is opened.
3. Handle global layout changes properly by having the MenuPopup
re-drawing/positioning itself.
Bug:
23973158
Change-Id: Iee866079770026f0fe17814892abc9825f9760a2
Oren Blasberg [Thu, 10 Sep 2015 16:58:01 +0000 (16:58 +0000)]
Merge "Add Cascading submenus implementation."
Oren Blasberg [Wed, 2 Sep 2015 21:25:56 +0000 (14:25 -0700)]
Add Cascading submenus implementation.
This change adds a new Cascading implementation of MenuPopup. When
enabled, submenus will show up in a cascading side by side fashion
when opened next to popup menus.
Bug:
20127825
Change-Id: Ie3c797fb5dbada7521cd93dc4171950af2be2ff7
Alan Viverette [Thu, 10 Sep 2015 12:34:03 +0000 (12:34 +0000)]
am
081b1cff: am
1ebac03c: am
a5ec056b: Merge "CalendarView: use theme attribute instead of style on MonthName TextView"
* commit '
081b1cffc46c61d3fc6830f15c1a24475d8612fe':
CalendarView: use theme attribute instead of style on MonthName TextView
Alan Viverette [Thu, 10 Sep 2015 12:26:58 +0000 (12:26 +0000)]
am
1ebac03c: am
a5ec056b: Merge "CalendarView: use theme attribute instead of style on MonthName TextView"
* commit '
1ebac03cbe74c2c04aabfd485dab5d366632946b':
CalendarView: use theme attribute instead of style on MonthName TextView
Alan Viverette [Thu, 10 Sep 2015 12:19:40 +0000 (12:19 +0000)]
am
a5ec056b: Merge "CalendarView: use theme attribute instead of style on MonthName TextView"
* commit '
a5ec056b8331b2560f5c6f9543471884894914f1':
CalendarView: use theme attribute instead of style on MonthName TextView
Alan Viverette [Thu, 10 Sep 2015 12:13:28 +0000 (12:13 +0000)]
Merge "CalendarView: use theme attribute instead of style on MonthName TextView"
Young-Ho Cha [Thu, 10 Sep 2015 06:03:26 +0000 (15:03 +0900)]
CalendarView: use theme attribute instead of style on MonthName TextView
Change-Id: I0d891ab08e61df7422fb0aea50a4c31196792189
Signed-off-by: Young-Ho Cha <ganadist@gmail.com>
Amit Mahajan [Thu, 10 Sep 2015 01:53:08 +0000 (01:53 +0000)]
am
b4c8e919: am
f327fd34: am
5a45dc96: am
0018323c: Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev
* commit '
b4c8e9191f4dd3ea641986513cfeefa2348133da':
Add carrier config variable to hide preferred network type
Daniel Sandler [Thu, 10 Sep 2015 01:53:01 +0000 (01:53 +0000)]
am
1d49a967: am
c6fa5914: am
847bdf00: am
5b40e225: Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev
* commit '
1d49a967ef6fe0c3594870cfc73045ab53ba77ac':
Make the vertical navbar 48dp like the horizontal one.
Jorim Jaggi [Thu, 10 Sep 2015 01:38:54 +0000 (18:38 -0700)]
resolved conflicts for
0fb3f695 to master.
Change-Id: I679920313a872f8eb81cf00ffb6ffe037b8d0a3a
Amit Mahajan [Thu, 10 Sep 2015 01:21:17 +0000 (01:21 +0000)]
am
f327fd34: am
5a45dc96: am
0018323c: Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev
* commit '
f327fd34c94781469e0219e27b91f25039cfb2cb':
Add carrier config variable to hide preferred network type
Daniel Sandler [Thu, 10 Sep 2015 01:21:09 +0000 (01:21 +0000)]
am
c6fa5914: am
847bdf00: am
5b40e225: Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev
* commit '
c6fa59145e690f8140fda9d79934f1b66ea354d3':
Make the vertical navbar 48dp like the horizontal one.
Amit Mahajan [Thu, 10 Sep 2015 01:13:53 +0000 (01:13 +0000)]
am
5a45dc96: am
0018323c: Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev
* commit '
5a45dc960b42eae66661665ff9a6bcb7e4a02c16':
Add carrier config variable to hide preferred network type
Daniel Sandler [Thu, 10 Sep 2015 01:13:47 +0000 (01:13 +0000)]
am
847bdf00: am
5b40e225: Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev
* commit '
847bdf0093f649a169940fb93249e2beb67f6b45':
Make the vertical navbar 48dp like the horizontal one.
Jorim Jaggi [Thu, 10 Sep 2015 01:06:47 +0000 (01:06 +0000)]
am
17076cc2: am
5a9bb951: resolved conflicts for
5d0e02b6 to cw-e-dev
* commit '
17076cc262ff7e6b384bcb7354983c21ac33a8e9':
Add double-tap power button to open camera 1/2
Amit Mahajan [Thu, 10 Sep 2015 01:04:43 +0000 (01:04 +0000)]
am
0018323c: Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev
* commit '
0018323c07d119fde7260d66f60dd9987c7b74ea':
Add carrier config variable to hide preferred network type
Daniel Sandler [Thu, 10 Sep 2015 01:04:39 +0000 (01:04 +0000)]
am
5b40e225: Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev
* commit '
5b40e2253e82d46838c88e6c52dee276a781d593':
Make the vertical navbar 48dp like the horizontal one.
Jorim Jaggi [Thu, 10 Sep 2015 00:57:12 +0000 (00:57 +0000)]
am
5a9bb951: resolved conflicts for
5d0e02b6 to cw-e-dev
* commit '
5a9bb9516d016549730d49cddcc2b2ee0e7a4e93':
Add double-tap power button to open camera 1/2
Amit Mahajan [Thu, 10 Sep 2015 00:55:15 +0000 (00:55 +0000)]
Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev
Jeff Sharkey [Thu, 10 Sep 2015 00:53:29 +0000 (00:53 +0000)]
am
2f12ee71: am
a8831ba8: am
5b9f8dd7: am
2ebbf4c8: Merge "Special interval value to always run benchmarks." into mnc-dr-dev
* commit '
2f12ee718338d4a40261c605a1fc881e6f6d5893':
Special interval value to always run benchmarks.
Daniel Sandler [Thu, 10 Sep 2015 00:53:14 +0000 (00:53 +0000)]
Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev
Jorim Jaggi [Thu, 10 Sep 2015 00:49:57 +0000 (17:49 -0700)]
resolved conflicts for
5d0e02b6 to cw-e-dev
Change-Id: Id974d29581304dc644659d1c470b5413d847944b
Jeff Sharkey [Thu, 10 Sep 2015 00:44:20 +0000 (00:44 +0000)]
am
a8831ba8: am
5b9f8dd7: am
2ebbf4c8: Merge "Special interval value to always run benchmarks." into mnc-dr-dev
* commit '
a8831ba898480354876d7486475885a267c35194':
Special interval value to always run benchmarks.
Sungmin Choi [Tue, 8 Sep 2015 22:34:23 +0000 (15:34 -0700)]
Add carrier config variable to hide preferred network type
Bug:
23862319
Change-Id: I99403f358f0b53f366083edafc3762f5679b0b45
Jeff Sharkey [Thu, 10 Sep 2015 00:36:28 +0000 (00:36 +0000)]
am
5b9f8dd7: am
2ebbf4c8: Merge "Special interval value to always run benchmarks." into mnc-dr-dev
* commit '
5b9f8dd73fc08ac738002b5259bbfdbae8839b49':
Special interval value to always run benchmarks.
Jorim Jaggi [Thu, 10 Sep 2015 00:29:11 +0000 (00:29 +0000)]
am
35a88c06: am
f27035d9: am
131d541a: am
16093fe3: Revert "Disable fingerprint after force lock"
* commit '
35a88c065e24248ff6036eb3c5a581a1a520f8fe':
Revert "Disable fingerprint after force lock"
Jeff Sharkey [Thu, 10 Sep 2015 00:26:33 +0000 (00:26 +0000)]
am
2ebbf4c8: Merge "Special interval value to always run benchmarks." into mnc-dr-dev
* commit '
2ebbf4c899b39e080be1ec9cd5d1178f30c0cd89':
Special interval value to always run benchmarks.
Jorim Jaggi [Thu, 10 Sep 2015 00:25:59 +0000 (00:25 +0000)]
Merge "Add double-tap power button to open camera 1/2" into mnc-dr-dev
Jorim Jaggi [Thu, 10 Sep 2015 00:21:30 +0000 (00:21 +0000)]
am
f27035d9: am
131d541a: am
16093fe3: Revert "Disable fingerprint after force lock"
* commit '
f27035d9ee506e4f817ccd49ab60df541c25bbe7':
Revert "Disable fingerprint after force lock"
Jeff Sharkey [Thu, 10 Sep 2015 00:18:43 +0000 (00:18 +0000)]
Merge "Special interval value to always run benchmarks." into mnc-dr-dev
Jorim Jaggi [Thu, 10 Sep 2015 00:12:21 +0000 (00:12 +0000)]
am
131d541a: am
16093fe3: Revert "Disable fingerprint after force lock"
* commit '
131d541ae1ca41aacf751f6a6562f4f031a4ab35':
Revert "Disable fingerprint after force lock"
Jorim Jaggi [Thu, 10 Sep 2015 00:05:38 +0000 (00:05 +0000)]
am
16093fe3: Revert "Disable fingerprint after force lock"
* commit '
16093fe3f0d824731a53a264a132504deb08421a':
Revert "Disable fingerprint after force lock"
Jorim Jaggi [Wed, 9 Sep 2015 23:29:17 +0000 (23:29 +0000)]
Revert "Disable fingerprint after force lock"
Bug:
23827042
This reverts commit
0cb50efdc2d3ecaa9f1b2163109e8fff1b23f0e7.
Change-Id: I40251500b2dcf95e63ce39a768e11a50b26fb923
Adrian Roos [Thu, 3 Sep 2015 22:59:49 +0000 (15:59 -0700)]
Add double-tap power button to open camera 1/2
Bug:
23787555
Change-Id: I052b64748f155c59fbb649b32265f559423a8845
Hans Boehm [Wed, 9 Sep 2015 23:50:45 +0000 (23:50 +0000)]
am
1d815272: am
58c27e3e: am
c0ce6c42: Merge "Reduce risk of memory corruption due to finalization."
* commit '
1d8152726b7ef2094f2e99619581c2abd2117381':
Reduce risk of memory corruption due to finalization.
Hans Boehm [Wed, 9 Sep 2015 23:44:37 +0000 (23:44 +0000)]
am
58c27e3e: am
c0ce6c42: Merge "Reduce risk of memory corruption due to finalization."
* commit '
58c27e3e53ef64072412515792433e570a176f15':
Reduce risk of memory corruption due to finalization.
Jeff Sharkey [Wed, 9 Sep 2015 21:53:38 +0000 (14:53 -0700)]
Special interval value to always run benchmarks.
When interval is set of 0, always run benchmarks after every fstrim
pass, which is roughly daily. We don't actually track the last
benchmark time for internal storage, so this is the best way we have
to enable this.
Also disable benchmarking completely when interval is set to -1.
Bug:
23942769
Change-Id: I11edfda063aac6e927c6cce56567169ebe83cb71
Selim Cinek [Wed, 9 Sep 2015 22:44:16 +0000 (22:44 +0000)]
am
26a11c28: am
d428dc4a: am
12fdaf85: am
a4fca2c7: Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev
* commit '
26a11c28563c497625f00fc4fba319de9119ee60':
Fixed a racecondition where the camera would not launch
Hans Boehm [Wed, 9 Sep 2015 22:41:42 +0000 (22:41 +0000)]
am
c0ce6c42: Merge "Reduce risk of memory corruption due to finalization."
* commit '
c0ce6c422cfe089e7a8e209ac924e37bed3ca770':
Reduce risk of memory corruption due to finalization.
Vadim Tryshev [Wed, 9 Sep 2015 22:41:23 +0000 (22:41 +0000)]
Merge "Showing task selection menus."
Selim Cinek [Wed, 9 Sep 2015 22:30:25 +0000 (22:30 +0000)]
am
d428dc4a: am
12fdaf85: am
a4fca2c7: Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev
* commit '
d428dc4a326f1a928875ecda1c12eef445473dc5':
Fixed a racecondition where the camera would not launch
Hans Boehm [Wed, 9 Sep 2015 22:28:42 +0000 (22:28 +0000)]
Merge "Reduce risk of memory corruption due to finalization."
Selim Cinek [Wed, 9 Sep 2015 22:23:20 +0000 (22:23 +0000)]
am
12fdaf85: am
a4fca2c7: Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev
* commit '
12fdaf8589813065d2e8b9873196471ed38c7b80':
Fixed a racecondition where the camera would not launch
Selim Cinek [Wed, 9 Sep 2015 22:15:55 +0000 (22:15 +0000)]
am
a4fca2c7: Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev
* commit '
a4fca2c7255367b96fc8012b0fcb62a71343e1ff':
Fixed a racecondition where the camera would not launch
Selim Cinek [Wed, 9 Sep 2015 22:07:02 +0000 (22:07 +0000)]
Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev
Vadim Tryshev [Tue, 8 Sep 2015 15:10:52 +0000 (08:10 -0700)]
Showing task selection menus.
These popup menus are shown when a clicked app has > 1 recent tasks.
We still activate the latest task in addition to showing the menu.
Showing task icons in the menu, as well as showing the menu in its UX-polished
form is not yet implemented.
Bug:
20024603
Change-Id: I05e8fe9592501fdd01cbc9032080e4286a658a65
Jorim Jaggi [Wed, 9 Sep 2015 21:59:23 +0000 (21:59 +0000)]
am
463bf7cc: am
46154b8f: am
b5304547: am
5e354223: Use AlarmManager for lockout reset
* commit '
463bf7cc36660174166ad2aab7d1814bf35c8066':
Use AlarmManager for lockout reset
Jorim Jaggi [Wed, 9 Sep 2015 21:48:23 +0000 (21:48 +0000)]
am
46154b8f: am
b5304547: am
5e354223: Use AlarmManager for lockout reset
* commit '
46154b8fa50c4e8176225981500ad95a5b667cea':
Use AlarmManager for lockout reset
Ben Kwa [Wed, 9 Sep 2015 21:10:29 +0000 (21:10 +0000)]
Merge "Fix a crash during file deletion."
Jorim Jaggi [Wed, 9 Sep 2015 21:00:49 +0000 (21:00 +0000)]
am
b5304547: am
5e354223: Use AlarmManager for lockout reset
* commit '
b53045476ce228d510b045276f84f004d3b9eeb8':
Use AlarmManager for lockout reset
Jorim Jaggi [Wed, 9 Sep 2015 20:54:42 +0000 (20:54 +0000)]
am
5e354223: Use AlarmManager for lockout reset
* commit '
5e354223d817477efac9a6a2e3ce3d9161e046a4':
Use AlarmManager for lockout reset
Chris Craik [Wed, 9 Sep 2015 20:51:41 +0000 (20:51 +0000)]
Merge "CanvasState frame init refactor"
Ben Kwa [Wed, 9 Sep 2015 20:49:07 +0000 (13:49 -0700)]
Fix a crash during file deletion.
Fix an off-by-one error when checking deletion candidates, that was
causing item positions to be incorrectly bumped following a successful
deletion.
BUG=
23823860
Change-Id: Id261ad49271fb0c1a5ff1cba88fea1451412d7f3
Jorim Jaggi [Fri, 4 Sep 2015 21:17:58 +0000 (14:17 -0700)]
Use AlarmManager for lockout reset
So the lockout reset exactly fires after 30 seconds, independent
of whether the device was in deep sleep.
Bug:
23668918
Change-Id: Idea1a877c395897c1fd075cf98edf41c8b1f4082
Nick Armstrong-Crews [Wed, 9 Sep 2015 19:59:50 +0000 (19:59 +0000)]
Merge "Remove @hide for KEYCODE_SOFT_SLEEP."
Filip Gruszczynski [Wed, 9 Sep 2015 19:49:15 +0000 (19:49 +0000)]
Merge "Refactorings for Window Manager module."
Filip Gruszczynski [Wed, 9 Sep 2015 19:47:27 +0000 (19:47 +0000)]
Merge "Better logging when starting window request is rejected."
Steve McKay [Wed, 9 Sep 2015 19:12:20 +0000 (19:12 +0000)]
Merge "Don't start band select on empty grid."
Steve McKay [Wed, 9 Sep 2015 00:15:25 +0000 (17:15 -0700)]
Don't start band select on empty grid.
Masks an issue in band controller resulting in index out of bounds exceptions.
Eliminate the need to cast helper when constructing BandController.
Improve naming of Band related classes for clarity of purpose.
Normalize some "helper" class method names.
Rename BandSelectModelTest to match existing convention for tests on inner classes.
Bug:
23905473
Change-Id: Iaf7604fb729cf563a04dc92d78b24e2fe4812abe
Filip Gruszczynski [Sat, 5 Sep 2015 22:00:00 +0000 (15:00 -0700)]
Refactorings for Window Manager module.
Following improvements were applied:
* extract code from a very large method
WindowSurfacePlacer.performSurfacePlacementInner into
WindowsurfacePlacer.applySurfaceChangesTransaction; smaller methods
are easier to understand;
* WindowStateAnimator.showSurfaceRobustlyLocked can be privatized, it
is only called from one place; also there is unnecessary check for
whether mSurfaceControl is not null;
* prepareAppTransition code can be mostly moved into AppTransition;
it calls mostly methods from this class; as a result some methods
from AppTransition can be privatized;
* requestTraversalLocked can be moved into WindowSurfacePlacer, which
allows mTraversalScheduled to be a private field inside the placer;
this way WindowSurfacePlacer can nicely control and hide the need for
layouts.
Change-Id: I99006c859ef224f5dad933f5c15d2cb2b9738a9e
Jason Monk [Wed, 9 Sep 2015 18:49:58 +0000 (18:49 +0000)]
Merge "QS: Add long-press to customize prototype - part 3"
Filip Gruszczynski [Wed, 9 Sep 2015 18:30:12 +0000 (11:30 -0700)]
Better logging when starting window request is rejected.
Change-Id: Iba0469c7f00ab0cfe1901ef7e16a6e81cd045392
Jason Monk [Wed, 9 Sep 2015 18:00:31 +0000 (18:00 +0000)]
Merge "QS: Add long-press to customize prototype - part 2"
Jason Monk [Wed, 9 Sep 2015 17:50:34 +0000 (13:50 -0400)]
QS: Add long-press to customize prototype - part 3
Adding FAB button to QS customization screen, currently it does
nothing.
Change-Id: I4d4d4cd0a6dd5d2104cf21011855fcfce13c70d7
Jason Monk [Wed, 9 Sep 2015 17:03:20 +0000 (13:03 -0400)]
QS: Add long-press to customize prototype - part 2
- Add info/remove drop targets that appear during dragging
- Move drag start into NonPagedTileLayout so that both start
and end of tile move drags are in the same place.
- Still needs way to add tiles
Change-Id: If843ebbb86f393b461289c1407c6a82b6a5aed9d
Vineeta Srivastava [Wed, 9 Sep 2015 17:46:58 +0000 (17:46 +0000)]
am
71474c66: am
63d94e4c: am
95198ee9: am
ebd14658: Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev
* commit '
71474c66bf2b14c1421699937011ef38501dad76':
Add carrier config variable to hide ims apn
Vineeta Srivastava [Wed, 9 Sep 2015 17:40:34 +0000 (17:40 +0000)]
am
63d94e4c: am
95198ee9: am
ebd14658: Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev
* commit '
63d94e4c3be9190554ed51f2b00eb764707fd848':
Add carrier config variable to hide ims apn
Vineeta Srivastava [Wed, 9 Sep 2015 17:31:06 +0000 (17:31 +0000)]
am
95198ee9: am
ebd14658: Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev
* commit '
95198ee9ce374582e71b5a29e740e97b7b7b198b':
Add carrier config variable to hide ims apn
Vineeta Srivastava [Wed, 9 Sep 2015 17:22:28 +0000 (17:22 +0000)]
am
ebd14658: Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev
* commit '
ebd1465885af2a1de5a885dac791ee6184f85d7f':
Add carrier config variable to hide ims apn
Vineeta Srivastava [Wed, 9 Sep 2015 17:12:39 +0000 (17:12 +0000)]
Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev
Nick Armstrong-Crews [Wed, 9 Sep 2015 16:25:03 +0000 (09:25 -0700)]
Remove @hide for KEYCODE_SOFT_SLEEP.
Change-Id: I56a6da9faeafb26145e1d9ad82a16df46320c24e
Tyler Gunn [Wed, 9 Sep 2015 17:01:45 +0000 (10:01 -0700)]
resolved conflicts for
ce88b828 to master
Change-Id: Ibf9f4bc876f32c8f5de86ee8338dcff3a5276cfb
Tyler Gunn [Wed, 9 Sep 2015 16:34:04 +0000 (16:34 +0000)]
am
67e4317a: am
6544d5a2: am
dee1c5c9: Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev
* commit '
67e4317aa3671f6bff1855922e794ae1c6588bd2':
Add carrier config for specifying invalid characters.
Tyler Gunn [Wed, 9 Sep 2015 16:26:30 +0000 (16:26 +0000)]
am
6544d5a2: am
dee1c5c9: Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev
* commit '
6544d5a2a7089b6e76c0548cd9f63f9400ce1082':
Add carrier config for specifying invalid characters.
Tyler Gunn [Wed, 9 Sep 2015 16:15:52 +0000 (16:15 +0000)]
am
dee1c5c9: Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev
* commit '
dee1c5c948a5e1b98577a3301882aac04154b5be':
Add carrier config for specifying invalid characters.
Tyler Gunn [Wed, 9 Sep 2015 16:09:33 +0000 (16:09 +0000)]
Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev
Tao Bai [Wed, 9 Sep 2015 16:08:12 +0000 (16:08 +0000)]
Merge "Load app resource as shared library."
Svetoslav Ganov [Wed, 9 Sep 2015 05:06:16 +0000 (05:06 +0000)]
am
5f677b11: (-s ours) am
4f1bd159: am
db4efcfa: am
f57d9856: am
4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit '
5f677b114c52db916207e95694027a50c2a30d51':
Add get_accounts app op
Svetoslav Ganov [Wed, 9 Sep 2015 02:08:18 +0000 (02:08 +0000)]
am
4f1bd159: am
db4efcfa: am
f57d9856: am
4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit '
4f1bd159d9042106d112cbf579c2daf82842f375':
Add get_accounts app op
Svetoslav Ganov [Wed, 9 Sep 2015 02:01:24 +0000 (02:01 +0000)]
am
db4efcfa: am
f57d9856: am
4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit '
db4efcfa8dd996841eb50cf2594bea641b4f217a':
Add get_accounts app op
Svetoslav Ganov [Wed, 9 Sep 2015 01:51:37 +0000 (01:51 +0000)]
am
f57d9856: am
4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit '
f57d98564b26953b722ab0e14222f50e6515f36d':
Add get_accounts app op
Tao Bai [Wed, 2 Sep 2015 01:49:54 +0000 (18:49 -0700)]
Load app resource as shared library.
- Added aapt command line flag --app-as-shared-lib to build app resources
that could be loaded as shared lib at runtime.
- Added new method AssetManager.addAssetPathAsSharedLibrary() to load an
app resource as shared library.
Bug
22487604
Change-Id: Ib9b33c35f9c2b7129f3ba205de03d4564623ea39
Svetoslav Ganov [Wed, 9 Sep 2015 01:42:56 +0000 (01:42 +0000)]
am
4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit '
4f7d0bc7af5fbb65796d24b130b7e9e63107bc5d':
Add get_accounts app op
Svetoslav Ganov [Wed, 9 Sep 2015 01:36:58 +0000 (01:36 +0000)]
Merge "Add get_accounts app op" into mnc-dev
Hans Boehm [Wed, 12 Nov 2014 01:01:37 +0000 (17:01 -0800)]
Reduce risk of memory corruption due to finalization.
Many classes in graphics/java and elsewhere deallocate native memory
in a finalizer on the assumption that instance methods can no longer
be called once the finalizer has been called. This is incorrect if
the object can be used, possibly indirectly, from another finalizer,
possibly one in the application.
This is the initial installment of a patch to cause such post-finalization
uses to at least see a null pointer rather than causing memory corruption
by accessing deallocated native memory. This should make it possible to
identify and fix such finalization ordering issues.
There are more graphics classes that need this treatment, and probably
many more in other subsystems.
This solution is < 100% effective if finalizers can be invoked
concurrently. We currently promise that they aren't.
(In my opinion, the real cause here is a language spec bug. But that ship
has sailed.)
Bug:
18178237
Change-Id: I844cf1e0fbb190407389c4f8e8f072752cca6198
Selim Cinek [Thu, 3 Sep 2015 23:01:53 +0000 (16:01 -0700)]
Fixed a racecondition where the camera would not launch
If the gesture was detected while turning on, the gesture
would not launch.
Bug:
23636271
Change-Id: I166759a55137163be0c3f38fe8d1dc0c18977e11
Zhentao Sun [Wed, 9 Sep 2015 01:10:18 +0000 (01:10 +0000)]
am
d6a94f49: am
aded82ce: am
6d8bdb50: am
5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev
* commit '
d6a94f495a86561a8e5a7f032e8179eae44abcaf':
Changed the vibration duration from 1s to 750ms.
Lorenzo Colitti [Wed, 9 Sep 2015 01:04:38 +0000 (01:04 +0000)]
am
fd183706: am
22262f31: am
0bc35668: am
017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev
* commit '
fd18370675f8794807747a18276dd7385e25f06e':
Require the new PACKET_KEEPALIVE_OFFLOAD permission.
Add an error code for generic hardware error.
Fix bugs and crashes in PacketKeepalive API.
Add tests for the PacketKeepalive API.
Add a PACKET_KEEPALIVE_OFFLOAD permission.
Use a CountDownLatch instead of sleep() in NetworkFactory tests.
Get rid of shortSleep() in ConnectivityServiceTest.
Make ConnectivityServiceTest a bit more readable.
Jorim Jaggi [Wed, 9 Sep 2015 01:04:25 +0000 (01:04 +0000)]
am
6198a703: am
2a198de7: am
975ceef6: am
52429b4a: Cancel animation when hiding Keyguard
* commit '
6198a70371ca799b705d7767ac8c710187ab68f8':
Cancel animation when hiding Keyguard
Zhentao Sun [Wed, 9 Sep 2015 00:59:39 +0000 (00:59 +0000)]
am
aded82ce: am
6d8bdb50: am
5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev
* commit '
aded82ce3134b7f8a2db7e4e7462e16e0428ef96':
Changed the vibration duration from 1s to 750ms.
Selim Cinek [Wed, 9 Sep 2015 00:56:55 +0000 (17:56 -0700)]
resolved conflicts for
09fd58fd to master
Change-Id: Icac7e81259d5269afe72eeadd7d761fc8d3af93e
Svetoslav [Tue, 8 Sep 2015 21:36:35 +0000 (14:36 -0700)]
Add get_accounts app op
For each runtime permission we have an app op to toggle the
permission for legacy apps as they cannot handle permission
revocations. We were lacking an app op for get_accounts
which prevented the user from controlling access to accounts
regardelss that they change the state of the permission
toggle in the UI. Even worse the permission UI is written
with the assumption that every runtime permission has an
app op and as a result revoking the contacts group (if the
app requests the get_accounts permission) is reset back to
allowed in the UI.
bug:
23854618
Change-Id: I9e3f9bfeb320bed561d718db99ee285915d5701b
Zhentao Sun [Wed, 9 Sep 2015 00:48:18 +0000 (00:48 +0000)]
am
6d8bdb50: am
5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev
* commit '
6d8bdb50b0cd26629a18ae3124fb29673069493b':
Changed the vibration duration from 1s to 750ms.
Lorenzo Colitti [Wed, 9 Sep 2015 00:45:42 +0000 (00:45 +0000)]
am
22262f31: am
0bc35668: am
017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev
* commit '
22262f31b964d595b56eb1277e4d88550a03e54c':
Require the new PACKET_KEEPALIVE_OFFLOAD permission.
Add an error code for generic hardware error.
Fix bugs and crashes in PacketKeepalive API.
Add tests for the PacketKeepalive API.
Add a PACKET_KEEPALIVE_OFFLOAD permission.
Use a CountDownLatch instead of sleep() in NetworkFactory tests.
Get rid of shortSleep() in ConnectivityServiceTest.
Make ConnectivityServiceTest a bit more readable.
Zhentao Sun [Wed, 9 Sep 2015 00:38:48 +0000 (00:38 +0000)]
am
5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev
* commit '
5536d4477572e437c95111630d5c2723350d99a5':
Changed the vibration duration from 1s to 750ms.
Lorenzo Colitti [Wed, 9 Sep 2015 00:38:42 +0000 (00:38 +0000)]
am
0bc35668: am
017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev
* commit '
0bc356687e022fa1ae611c4ebeb0e0622810d7e4':
Require the new PACKET_KEEPALIVE_OFFLOAD permission.
Add an error code for generic hardware error.
Fix bugs and crashes in PacketKeepalive API.
Add tests for the PacketKeepalive API.
Add a PACKET_KEEPALIVE_OFFLOAD permission.
Use a CountDownLatch instead of sleep() in NetworkFactory tests.
Get rid of shortSleep() in ConnectivityServiceTest.
Make ConnectivityServiceTest a bit more readable.
Zhentao Sun [Wed, 9 Sep 2015 00:29:03 +0000 (00:29 +0000)]
Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev
Jorim Jaggi [Wed, 9 Sep 2015 00:28:48 +0000 (00:28 +0000)]
am
2a198de7: am
975ceef6: am
52429b4a: Cancel animation when hiding Keyguard
* commit '
2a198de79d0d5b93168a3fccd45977f5731b3451':
Cancel animation when hiding Keyguard