222626 Commits

Author SHA1 Message Date
Lorenzo Colitti
1a3c1650cc Merge "Don't crash when canceling alarms if a direct listener is present" 2015-11-24 05:00:37 +00:00
Lorenzo Colitti
9b43ce0c98 Don't crash when canceling alarms if a direct listener is present
If a direct listener alarm attempts to match a regular
PendingIntent alarm, it will attempt to fetch the binder of the
regular alarm's direct listener, which is null, and crash the
system with an NPE.

Bug: 25823676
Change-Id: I85fb98b43436930a2513274dc5ab408f7d41d97f
2015-11-24 13:47:14 +09:00
Kevin Neas
9a24b9f1d1 Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am: 4dbb586585 am: b6ae32162e am: 32a7d85f64
am: 28c7363e8d  -s ours

* commit '28c7363e8dd7c85606a1e336710aa51963f1d174':
  DO NOT MERGE. Cherrypick UiBench from Master
2015-11-24 03:00:54 +00:00
Kevin Neas
28c7363e8d Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am: 4dbb586585 am: b6ae32162e
am: 32a7d85f64

* commit '32a7d85f64a193745de81ee94b7b4d7adefb3f02':
  DO NOT MERGE. Cherrypick UiBench from Master
2015-11-24 02:54:07 +00:00
Kevin Neas
32a7d85f64 Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am: 4dbb586585
am: b6ae32162e

* commit 'b6ae32162e77d9f11620b6806dec20a0987e2dab':
  DO NOT MERGE. Cherrypick UiBench from Master
2015-11-24 02:46:24 +00:00
Selim Cinek
d7c58462ae Merge "Fixed a bug where notifications were not updated inplace" 2015-11-24 02:30:13 +00:00
Kevin Neas
b6ae32162e Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev
am: 4dbb586585

* commit '4dbb58658552d1cdae46ef06d331b867f5610786':
  DO NOT MERGE. Cherrypick UiBench from Master
2015-11-24 01:58:00 +00:00
Adam Lesinski
47ef9c1a82 Merge "AAPT2: Record source/comments for compound values' children" 2015-11-24 01:17:08 +00:00
Winson
8f0e3a68cd Hiding the docked task from the stack.
Bug: 25665312

Change-Id: I1e0deb8c3b02604ce4f21d367430d50da9d3b86b
2015-11-24 01:00:46 +00:00
Adam Lesinski
1ad32caccc Merge "AAPT2: Verify min/max attr fields" 2015-11-24 00:53:44 +00:00
Kevin Neas
4dbb586585 Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev 2015-11-24 00:50:18 +00:00
Winson
805578d848 Fixing animation jump when dismissing paged task.
Change-Id: Ida07053da59f14f8ef3820e48a7bc73eef15840f
2015-11-24 00:44:32 +00:00
Winson Chung
17b2da4f6f Merge "Making stack visibility more specific to the launching tasks." 2015-11-24 00:44:14 +00:00
Winson Chung
80b3418a30 Merge "Porting over keyboard changes from other branch." 2015-11-24 00:42:57 +00:00
Winson Chung
37b05e0718 Merge "Removing unused code" 2015-11-24 00:42:24 +00:00
Winson Chung
b3709400d1 Merge "Adding tuner params for paging and full screen thumbnails." 2015-11-24 00:41:54 +00:00
Winson Chung
f5c260177c Merge "Initial changes to stack layout to support paging and nonsquare thumbs." 2015-11-24 00:41:40 +00:00
Winson
b1e71d09f2 Making stack visibility more specific to the launching tasks.
- When going from freeform -> overview, hide all freeform tasks until
  the final frame of the enter transition, if the stack we are
  launching to/from is in the freeform stack
- When going from overview -> freeform, hide all freeform tasks after
  the first frame of the exit transition, if we are launching a task
  in the freeform stack
- Separate the dragging gesture from the freeform launch visibility

Bug: 25842568

Change-Id: Ibcd17a02eeb70244ac73f599b8c23c71d22f73fd
2015-11-23 16:37:45 -08:00
Vladislav Kaznacheev
f2d7fa3a99 Merge "Implement View.updateDragShadow" 2015-11-24 00:31:10 +00:00
Vladislav Kaznacheev
6e1a022f32 Merge "Prevent animated drag shadow from being dragged." 2015-11-24 00:23:49 +00:00
Winson
e5f1faa9f8 Porting over keyboard changes from other branch.
- Allow ignoring alt-key release when interacting via touch while 
  alt-tab is pressed (ag/814903)
- Cancel window animations only if the stack scrolls via alt-tab 
  (ag/809873)
- Fixing issue with old task load plan being consumed if user alt-tabs
  before Recents is resumed (ag/811354)
- Canceling enter animations when the stack scrolls (ag/814461)

Change-Id: I7450f0a280571e98212f321b1e61219d149fed65
2015-11-23 15:56:37 -08:00
Winson
397ae74733 Removing unused code
- Removing code related to dismiss-all and stack filtering

Change-Id: Ife3c300970b234a5f7828a3c04f1eb9cb861399f
2015-11-23 15:56:26 -08:00
Winson
8b1871d741 Adding tuner params for paging and full screen thumbnails.
- Adding “focused” stack state to support paging
- Changing the paging to match UX spec (only auto-page after the first
  tap)
- Removing old header focus animation

Change-Id: Id72825b8a1b1c0a2238ee184a6695b13c1d8cb1c
2015-11-23 15:55:52 -08:00
Winson
4993c2f17e Initial changes to stack layout to support paging and nonsquare thumbs.
- Moving to a couple piecewise curves to define the various overview
  layout states.  Added a new state for focus (to be used in follow up
  CL) to control paging of overview from the nav bar button.  This 
  allows us to control the visible range of items on the curve, and 
  to better fit other UI controls around the stack.
- Removed the scaling of the tasks in the stack
- Also refactoring parametric curve to just use the system Path

Change-Id: I4108da77986d86896576e36fa8f31189d6fcb6f3
2015-11-23 15:55:46 -08:00
Suprabh Shukla
edcfc1873a Merge "Changing the message on user switching dialog." 2015-11-23 23:51:25 +00:00
Selim Cinek
a6a6f03c1b Fixed a bug where notifications were not updated inplace
The logic was inverted before.

Change-Id: Iaa16fc38905ebd6b10ba6eb925b8f332306feaa5
2015-11-23 23:49:33 +00:00
Suprabh Shukla
4fe508b6d3 Changing the message on user switching dialog.
On systems where primary user is different from the system user,
the message "Switching to Owner..." is displayed while logging out
from any user. Changing it to "Logging out <username>".

Bug: b/25749937

Change-Id: Id519bbd444c6b3f951511d6e566c503d06c510a1
2015-11-23 15:33:01 -08:00
Oren Blasberg
df94885e47 Merge "Enable cascading submenus for screensizes >= 720dp." 2015-11-23 22:36:17 +00:00
Adam Lesinski
28cacf091a AAPT2: Record source/comments for compound values' children
Values like styles or arrays have children which need to have
their source and comments preserved.

Change-Id: I6fc713ba36627e6d66c7930b4080cc1403bac207
2015-11-23 14:22:47 -08:00
Adrian Roos
10613a9472 Merge "Visuals for Inline Reply" 2015-11-23 22:19:09 +00:00
Xiaohui Chen
99a1e50b86 Merge "Add com.android.settings to white list" 2015-11-23 22:07:41 +00:00
Zhijun He
bfeaa0aee5 Merge "Camera2: add dynamic black level support" 2015-11-23 21:42:58 +00:00
Alan Viverette
432cfef802 Merge "Always assume layout params changed if app targets <= M" 2015-11-23 21:07:39 +00:00
Alan Viverette
71ec0a9ba7 Always assume layout params changed if app targets <= M
Previously we were lax about whether an app needed to call
setLayoutParams() when changing layout param (ex. height), but now
failing to call set will break layout.

Bug: 25801251
Bug: 25836190
Change-Id: I4431526ab38b9e3cbdf3553e41db6251d2a7fbc3
2015-11-23 15:54:10 -05:00
Zhijun He
cd950b682c Camera2: add dynamic black level support
Also add the optical black regions static memtadata.

Bug: 23011454
Change-Id: I217f33e89e046991f4cded7f7213ce6793ec4e68
2015-11-23 12:09:10 -08:00
Adrian Roos
fe84e1f436 Visuals for Inline Reply
Change-Id: I374a7ec82795f95fe2f3ce8c9e6b02c1479433af
2015-11-23 20:07:49 +00:00
Xiaohui Chen
9c990c15ee Add com.android.settings to white list
Bug: 24256521
Change-Id: If315b082960190b3ebea387484f5a00e707ef558
2015-11-23 12:03:08 -08:00
Adam Lesinski
a587065721 AAPT2: Verify min/max attr fields
Integers are now checked to see if they fall in the range
of min/max for the attribute they are assigned.

Change-Id: I42c435b15fd3f0bd23691c83efccce4ad5973276
2015-11-23 12:01:15 -08:00
Chong Zhang
95cdbd6f6d Merge "Fix black wallpaper when docking a non-resizeable task" 2015-11-23 19:42:49 +00:00
Jorim Jaggi
f471594009 Fix velocity when dragging up from nav bar
Change-Id: I4afd0f41050ffaecd05de455afda5d006be2c30b
2015-11-23 18:53:51 +00:00
Jae Seo
97ba86ac5d Merge "TIF: Use System.nanoTime() to measure execution durations in sessions" 2015-11-23 18:51:10 +00:00
Jorim Jaggi
bb42a46631 Don't play recents window animation when using affordance
Change-Id: Ifef60529ddda824790bf10cdb91abbb176703aac
2015-11-23 18:45:55 +00:00
Jorim Jaggi
1aaed1a162 Merge "Don't play animation when docking stack with affordance" 2015-11-23 18:43:38 +00:00
Makoto Onuki
42490c074d Merge "Remove UserManager.setSystemControlledUserRestriction()" 2015-11-23 18:42:55 +00:00
Makoto Onuki
ac65e1e1db Remove UserManager.setSystemControlledUserRestriction()
Now that we don't have UM.setUserRestriction*s*() that could remove
all existing restrictions, there's almost no point handling
DISALLOW_RECORD_AUDIO differently.

Now DISALLOW_RECORD_AUDIO is handled just like other restrictions,
except we don't persist it.

Bug 24954662

Change-Id: I27875b4a74dd95a3ce6bb774081eeaf718eaec15
2015-11-23 10:41:42 -08:00
Chong Zhang
0abb20f374 Fix black wallpaper when docking a non-resizeable task
Separate WindowState.isFullscreen into two methods, isFrameFullscreen()
that returns whether the window frame is fullscreen, and
isObscuringFullscreen(), which returns whether the window is actually
covering fullscreen.

In case of a docking task that's non-resizeable, the window frame is
fullscreen but since the stack is not fullscreen, the window is cropped
to stack bounds and is not obsuring the screen.

bug: 25433902

Change-Id: I7cd80381601fdc1fe87d04608b6a453806920590
2015-11-23 10:40:37 -08:00
Jorim Jaggi
030979c1e4 Don't play animation when docking stack with affordance
Change-Id: I1bb8ae4047e3de3a4ea159e7fad718914b9b5ba7
2015-11-23 18:35:02 +00:00
Geoff Mendal
27777dcb5a Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: d273c053ce -s ours
am: 3ed855b01a  -s ours

* commit '3ed855b01a829229aacf7250821913f6d77e47cf':
  Import translations. DO NOT MERGE
2015-11-23 18:08:07 +00:00
Alan Treadway
883f12ac5a Merge "Revert "Disable multiple user for corp-liable mode"" 2015-11-23 17:58:39 +00:00
Geoff Mendal
3ed855b01a Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: d273c053ce  -s ours

* commit 'd273c053ce85585d223d152bacf6e9e4c6859d1e':
  Import translations. DO NOT MERGE
2015-11-23 17:58:21 +00:00