OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge changes from topic 'AddPrinters'
Philip P. Moltmann [Tue, 24 Nov 2015 21:33:39 +0000 (21:33 +0000)]
Merge changes from topic 'AddPrinters'

* changes:
  Create PrintDiscoverySession for future print services
  Update printer availability when printSpooler is paused. This makes the window update syncronously when in multi-window mode.

8 years agoMerge "Allow fragment state loss on fragment transaction"
Svetoslav Ganov [Tue, 24 Nov 2015 20:56:22 +0000 (20:56 +0000)]
Merge "Allow fragment state loss on fragment transaction"

8 years agoAllow fragment state loss on fragment transaction
Svetoslav [Tue, 24 Nov 2015 20:54:18 +0000 (12:54 -0800)]
Allow fragment state loss on fragment transaction

We are not saving the state of this fragment on onSaveState,
so its Okay to loose state while confirming the transaction.

bug:25847358

Change-Id: I2f6587d528b2d8b8f24a83954cc896a6ff514996

8 years agoMerge "Fix "some user restrictions not working" issue"
Makoto Onuki [Tue, 24 Nov 2015 20:34:25 +0000 (20:34 +0000)]
Merge "Fix "some user restrictions not working" issue"

8 years agoMerge "Animate drag shadow when the drag is cancelled"
Vladislav Kaznacheev [Tue, 24 Nov 2015 19:27:31 +0000 (19:27 +0000)]
Merge "Animate drag shadow when the drag is cancelled"

8 years agoAnimate drag shadow when the drag is cancelled
Vladislav Kaznacheev [Sat, 21 Nov 2015 02:49:59 +0000 (18:49 -0800)]
Animate drag shadow when the drag is cancelled

Added a placeholder animation (scale and alpha going down to 0).
Final UX spec is pending.

Change-Id: I324635d270cc4d7f865c9fe9ad2802b975d1e9ca

8 years agoMerge "Be more resiliant to notifications that don't use a builder."
Julia Reynolds [Tue, 24 Nov 2015 19:25:08 +0000 (19:25 +0000)]
Merge "Be more resiliant to notifications that don't use a builder."

8 years agoMerge "Using ParceledListSlice to get the list of activities in LauncherApps"
Sunny Goyal [Tue, 24 Nov 2015 19:23:11 +0000 (19:23 +0000)]
Merge "Using ParceledListSlice to get the list of activities in LauncherApps"

8 years agoUsing ParceledListSlice to get the list of activities in LauncherApps
Sunny Goyal [Tue, 24 Nov 2015 17:34:20 +0000 (09:34 -0800)]
Using ParceledListSlice to get the list of activities in LauncherApps

Bug: 25430879
Change-Id: I3a93bb1abcbcc54bc467e57c51f592b5946850cf

8 years agoMerge "INT_MAX nanoseconds is not very long"
John Reck [Tue, 24 Nov 2015 19:17:25 +0000 (19:17 +0000)]
Merge "INT_MAX nanoseconds is not very long"

8 years agoINT_MAX nanoseconds is not very long
John Reck [Tue, 24 Nov 2015 19:12:55 +0000 (11:12 -0800)]
INT_MAX nanoseconds is not very long

Bug: 25843358

If the time between last swap & current vsync grew larger
than 2 seconds it would overflow when placed into an int, causing
frames to be dropped as negative numbers are definitely
less than 2_ms.

Change-Id: Icd2136989e5bbf5a0e21611b95a4d515b5ff9b14

8 years agoMerge "Fetching firstInstallTime on demand"
Sunny Goyal [Tue, 24 Nov 2015 19:01:47 +0000 (19:01 +0000)]
Merge "Fetching firstInstallTime on demand"

8 years agoFetching firstInstallTime on demand
Sunny Goyal [Tue, 24 Nov 2015 18:42:11 +0000 (10:42 -0800)]
Fetching firstInstallTime on demand

Change-Id: I96442aaf119553ffb0ea94ff06713752e4490e0b

8 years agoMerge "AudioService: remove dead code"
Jean-Michel Trivi [Tue, 24 Nov 2015 18:24:58 +0000 (18:24 +0000)]
Merge "AudioService: remove dead code"

8 years agoMerge "Allow activities to handle density configuration changes"
Alan Viverette [Tue, 24 Nov 2015 17:42:54 +0000 (17:42 +0000)]
Merge "Allow activities to handle density configuration changes"

8 years agoMerge "Allow preloading of freefore multi window drawables."
Filip Gruszczynski [Tue, 24 Nov 2015 16:30:49 +0000 (16:30 +0000)]
Merge "Allow preloading of freefore multi window drawables."

8 years agoBe more resiliant to notifications that don't use a builder.
Julia Reynolds [Mon, 23 Nov 2015 19:00:20 +0000 (14:00 -0500)]
Be more resiliant to notifications that don't use a builder.

Bug: 25772839
Change-Id: I526001a21f959f7229443f487439c51c8d84f1ea

8 years agoAdd method isManagedProfile and isSystemOnlyUser
Mahaver Chopra [Wed, 11 Nov 2015 14:54:35 +0000 (14:54 +0000)]
Add method isManagedProfile and isSystemOnlyUser

Adding method isManagedProfile() and isSystemOnlyUser() for DPC to know
if running in a managed profile or system only user

Bug: 24464823
Change-Id: I79974fdfd60d2bfe52dee3b4c95becf47a5bf0b1

8 years agoMerge "Don't crash when canceling alarms if a direct listener is present"
Lorenzo Colitti [Tue, 24 Nov 2015 05:00:37 +0000 (05:00 +0000)]
Merge "Don't crash when canceling alarms if a direct listener is present"

8 years agoDon't crash when canceling alarms if a direct listener is present
Lorenzo Colitti [Sun, 22 Nov 2015 13:00:08 +0000 (22:00 +0900)]
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

8 years agoMerge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am: 4dbb586585...
Kevin Neas [Tue, 24 Nov 2015 03:00:54 +0000 (03:00 +0000)]
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

8 years agoMerge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am: 4dbb586585...
Kevin Neas [Tue, 24 Nov 2015 02:54:07 +0000 (02:54 +0000)]
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

8 years agoMerge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am: 4dbb586585
Kevin Neas [Tue, 24 Nov 2015 02:46:24 +0000 (02:46 +0000)]
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

8 years agoMerge "Fixed a bug where notifications were not updated inplace"
Selim Cinek [Tue, 24 Nov 2015 02:30:13 +0000 (02:30 +0000)]
Merge "Fixed a bug where notifications were not updated inplace"

8 years agoAllow preloading of freefore multi window drawables.
Filip Gruszczynski [Mon, 23 Nov 2015 20:34:22 +0000 (12:34 -0800)]
Allow preloading of freefore multi window drawables.

Bug: 25081468
Change-Id: Ic6ec6050882e5362e1ab8734962d163fff04b53d

8 years agoMerge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev
Kevin Neas [Tue, 24 Nov 2015 01:58:00 +0000 (01:58 +0000)]
Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev
am: 4dbb586585

* commit '4dbb58658552d1cdae46ef06d331b867f5610786':
  DO NOT MERGE. Cherrypick UiBench from Master

8 years agoMerge "AAPT2: Record source/comments for compound values' children"
Adam Lesinski [Tue, 24 Nov 2015 01:17:08 +0000 (01:17 +0000)]
Merge "AAPT2: Record source/comments for compound values' children"

8 years agoHiding the docked task from the stack.
Winson [Mon, 23 Nov 2015 17:15:08 +0000 (09:15 -0800)]
Hiding the docked task from the stack.

Bug: 25665312

Change-Id: I1e0deb8c3b02604ce4f21d367430d50da9d3b86b

8 years agoMerge "AAPT2: Verify min/max attr fields"
Adam Lesinski [Tue, 24 Nov 2015 00:53:44 +0000 (00:53 +0000)]
Merge "AAPT2: Verify min/max attr fields"

8 years agoMerge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev
Kevin Neas [Tue, 24 Nov 2015 00:50:18 +0000 (00:50 +0000)]
Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev

8 years agoFixing animation jump when dismissing paged task.
Winson [Mon, 23 Nov 2015 22:47:37 +0000 (14:47 -0800)]
Fixing animation jump when dismissing paged task.

Change-Id: Ida07053da59f14f8ef3820e48a7bc73eef15840f

8 years agoMerge "Making stack visibility more specific to the launching tasks."
Winson Chung [Tue, 24 Nov 2015 00:44:14 +0000 (00:44 +0000)]
Merge "Making stack visibility more specific to the launching tasks."

8 years agoMerge "Porting over keyboard changes from other branch."
Winson Chung [Tue, 24 Nov 2015 00:42:57 +0000 (00:42 +0000)]
Merge "Porting over keyboard changes from other branch."

8 years agoMerge "Removing unused code"
Winson Chung [Tue, 24 Nov 2015 00:42:24 +0000 (00:42 +0000)]
Merge "Removing unused code"

8 years agoMerge "Adding tuner params for paging and full screen thumbnails."
Winson Chung [Tue, 24 Nov 2015 00:41:54 +0000 (00:41 +0000)]
Merge "Adding tuner params for paging and full screen thumbnails."

8 years agoMerge "Initial changes to stack layout to support paging and nonsquare thumbs."
Winson Chung [Tue, 24 Nov 2015 00:41:40 +0000 (00:41 +0000)]
Merge "Initial changes to stack layout to support paging and nonsquare thumbs."

8 years agoMaking stack visibility more specific to the launching tasks.
Winson [Mon, 23 Nov 2015 20:40:23 +0000 (12:40 -0800)]
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

8 years agoMerge "Implement View.updateDragShadow"
Vladislav Kaznacheev [Tue, 24 Nov 2015 00:31:10 +0000 (00:31 +0000)]
Merge "Implement View.updateDragShadow"

8 years agoMerge "Prevent animated drag shadow from being dragged."
Vladislav Kaznacheev [Tue, 24 Nov 2015 00:23:49 +0000 (00:23 +0000)]
Merge "Prevent animated drag shadow from being dragged."

8 years agoPorting over keyboard changes from other branch.
Winson [Fri, 20 Nov 2015 20:26:23 +0000 (12:26 -0800)]
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

8 years agoRemoving unused code
Winson [Fri, 20 Nov 2015 19:27:33 +0000 (11:27 -0800)]
Removing unused code

- Removing code related to dismiss-all and stack filtering

Change-Id: Ife3c300970b234a5f7828a3c04f1eb9cb861399f

8 years agoAdding tuner params for paging and full screen thumbnails.
Winson [Fri, 20 Nov 2015 17:56:20 +0000 (09:56 -0800)]
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

8 years agoInitial changes to stack layout to support paging and nonsquare thumbs.
Winson [Thu, 19 Nov 2015 18:06:06 +0000 (10:06 -0800)]
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

8 years agoMerge "Changing the message on user switching dialog."
Suprabh Shukla [Mon, 23 Nov 2015 23:51:25 +0000 (23:51 +0000)]
Merge "Changing the message on user switching dialog."

8 years agoFixed a bug where notifications were not updated inplace
Selim Cinek [Mon, 23 Nov 2015 23:46:24 +0000 (15:46 -0800)]
Fixed a bug where notifications were not updated inplace

The logic was inverted before.

Change-Id: Iaa16fc38905ebd6b10ba6eb925b8f332306feaa5

8 years agoChanging the message on user switching dialog.
Suprabh Shukla [Sat, 21 Nov 2015 02:22:57 +0000 (18:22 -0800)]
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

8 years agoAudioService: remove dead code
Jean-Michel Trivi [Wed, 4 Nov 2015 22:45:54 +0000 (14:45 -0800)]
AudioService: remove dead code

Remove dead code related to media button event receiver and
  remote control display, now handled by MediaSession*

Change-Id: I4bd621240ddddf4df079df8d551c72b232c3301d

8 years agoMerge "Enable cascading submenus for screensizes >= 720dp."
Oren Blasberg [Mon, 23 Nov 2015 22:36:17 +0000 (22:36 +0000)]
Merge "Enable cascading submenus for screensizes >= 720dp."

8 years agoAAPT2: Record source/comments for compound values' children
Adam Lesinski [Mon, 23 Nov 2015 22:22:47 +0000 (14:22 -0800)]
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

8 years agoMerge "Visuals for Inline Reply"
Adrian Roos [Mon, 23 Nov 2015 22:19:09 +0000 (22:19 +0000)]
Merge "Visuals for Inline Reply"

8 years agoMerge "Add com.android.settings to white list"
Xiaohui Chen [Mon, 23 Nov 2015 22:07:41 +0000 (22:07 +0000)]
Merge "Add com.android.settings to white list"

8 years agoMerge "Camera2: add dynamic black level support"
Zhijun He [Mon, 23 Nov 2015 21:42:58 +0000 (21:42 +0000)]
Merge "Camera2: add dynamic black level support"

8 years agoMerge "Always assume layout params changed if app targets <= M"
Alan Viverette [Mon, 23 Nov 2015 21:07:39 +0000 (21:07 +0000)]
Merge "Always assume layout params changed if app targets <= M"

8 years agoAlways assume layout params changed if app targets <= M
Alan Viverette [Mon, 23 Nov 2015 20:54:10 +0000 (15:54 -0500)]
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

8 years agoCamera2: add dynamic black level support
Zhijun He [Fri, 13 Nov 2015 01:47:52 +0000 (17:47 -0800)]
Camera2: add dynamic black level support

Also add the optical black regions static memtadata.

Bug: 23011454
Change-Id: I217f33e89e046991f4cded7f7213ce6793ec4e68

8 years agoVisuals for Inline Reply
Adrian Roos [Wed, 4 Nov 2015 23:55:39 +0000 (15:55 -0800)]
Visuals for Inline Reply

Change-Id: I374a7ec82795f95fe2f3ce8c9e6b02c1479433af

8 years agoAdd com.android.settings to white list
Xiaohui Chen [Mon, 23 Nov 2015 20:03:08 +0000 (12:03 -0800)]
Add com.android.settings to white list

Bug: 24256521
Change-Id: If315b082960190b3ebea387484f5a00e707ef558

8 years agoAAPT2: Verify min/max attr fields
Adam Lesinski [Fri, 20 Nov 2015 23:32:30 +0000 (15:32 -0800)]
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

8 years agoMerge "Fix black wallpaper when docking a non-resizeable task"
Chong Zhang [Mon, 23 Nov 2015 19:42:49 +0000 (19:42 +0000)]
Merge "Fix black wallpaper when docking a non-resizeable task"

8 years agoFix velocity when dragging up from nav bar
Jorim Jaggi [Sat, 21 Nov 2015 02:16:28 +0000 (18:16 -0800)]
Fix velocity when dragging up from nav bar

Change-Id: I4afd0f41050ffaecd05de455afda5d006be2c30b

8 years agoMerge "TIF: Use System.nanoTime() to measure execution durations in sessions"
Jae Seo [Mon, 23 Nov 2015 18:51:10 +0000 (18:51 +0000)]
Merge "TIF: Use System.nanoTime() to measure execution durations in sessions"

8 years agoFix "some user restrictions not working" issue
Makoto Onuki [Fri, 20 Nov 2015 19:30:44 +0000 (11:30 -0800)]
Fix "some user restrictions not working" issue

SettingsProvider used to prevent any changes to certain settings
when the corresponding user restriction is set, which isn't really what
these restrictions mean.
Even if a user restriction is set, it should still changing in the more
restricting direction.

Also stop setting "" to LOCATION_PROVIDERS_ALLOWED, which will simply
be ignored.

Bug 25614198

Change-Id: Ifa8edc2927e21e6c6174620c8c874c86c1dc0f75

8 years agoDon't play recents window animation when using affordance
Jorim Jaggi [Sat, 21 Nov 2015 00:27:16 +0000 (16:27 -0800)]
Don't play recents window animation when using affordance

Change-Id: Ifef60529ddda824790bf10cdb91abbb176703aac

8 years agoMerge "Don't play animation when docking stack with affordance"
Jorim Jaggi [Mon, 23 Nov 2015 18:43:38 +0000 (18:43 +0000)]
Merge "Don't play animation when docking stack with affordance"

8 years agoMerge "Remove UserManager.setSystemControlledUserRestriction()"
Makoto Onuki [Mon, 23 Nov 2015 18:42:55 +0000 (18:42 +0000)]
Merge "Remove UserManager.setSystemControlledUserRestriction()"

8 years agoRemove UserManager.setSystemControlledUserRestriction()
Makoto Onuki [Fri, 20 Nov 2015 23:33:17 +0000 (15:33 -0800)]
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

8 years agoFix black wallpaper when docking a non-resizeable task
Chong Zhang [Thu, 19 Nov 2015 22:17:31 +0000 (14:17 -0800)]
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

8 years agoDon't play animation when docking stack with affordance
Jorim Jaggi [Fri, 20 Nov 2015 23:14:43 +0000 (15:14 -0800)]
Don't play animation when docking stack with affordance

Change-Id: I1bb8ae4047e3de3a4ea159e7fad718914b9b5ba7

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: d273c053ce -s ours
Geoff Mendal [Mon, 23 Nov 2015 18:08:07 +0000 (18:08 +0000)]
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

8 years agoMerge "Revert "Disable multiple user for corp-liable mode""
Alan Treadway [Mon, 23 Nov 2015 17:58:39 +0000 (17:58 +0000)]
Merge "Revert "Disable multiple user for corp-liable mode""

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Mon, 23 Nov 2015 17:58:21 +0000 (17:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: d273c053ce  -s ours

* commit 'd273c053ce85585d223d152bacf6e9e4c6859d1e':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: ae7c51a9cc -s ours...
Geoff Mendal [Mon, 23 Nov 2015 17:53:42 +0000 (17:53 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: ae7c51a9cc  -s ours am: 57b3e7508d  -s ours
am: 4b66f74aae  -s ours

* commit '4b66f74aaec86f2719ebd6f4a6d396ecee0540a2':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Mon, 23 Nov 2015 17:51:14 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 17:50:05 +0000 (18:50 +0100)]
Import translations. DO NOT MERGE

Change-Id: I6553e9e4da9e5e5c33aad42aa215d8d328f66509
Auto-generated-cl: translation import

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: ae7c51a9cc -s ours
Geoff Mendal [Mon, 23 Nov 2015 17:46:15 +0000 (17:46 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: ae7c51a9cc  -s ours
am: 57b3e7508d  -s ours

* commit '57b3e7508d1adb81cbe3b5aff24fbaaa71de9ce2':
  Import translations. DO NOT MERGE

8 years agoRevert "Disable multiple user for corp-liable mode"
Alan Treadway [Mon, 23 Nov 2015 17:40:54 +0000 (17:40 +0000)]
Revert "Disable multiple user for corp-liable mode"

This reverts commit 1dc510eb5bc7f279002a3479f24761f08cc390f7.

Change-Id: I12ea8275369cbdc4e95b21c7f5d51b4f0e5da7b2

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Mon, 23 Nov 2015 17:38:52 +0000 (17:38 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: ae7c51a9cc  -s ours

* commit 'ae7c51a9ccf1bc1030b33a64b095a4fe3b06a3bd':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Mon, 23 Nov 2015 17:32:02 +0000 (17:32 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 17:30:39 +0000 (18:30 +0100)]
Import translations. DO NOT MERGE

Change-Id: I000a0799900cec827d9df803e0aa6e0fdb28b236
Auto-generated-cl: translation import

8 years agoMerge "Only look for nearest child View in ViewGroup"
Alan Viverette [Mon, 23 Nov 2015 17:26:38 +0000 (17:26 +0000)]
Merge "Only look for nearest child View in ViewGroup"

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 23 Nov 2015 17:13:56 +0000 (17:13 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 17:10:29 +0000 (18:10 +0100)]
Import translations. DO NOT MERGE

Change-Id: Icde9477315609bb2233383760f9af1063dc4495a
Auto-generated-cl: translation import

8 years agoMerge "printspooler.NotificationCOntroller: Remove deprecated APIs and silence other...
Philip P. Moltmann [Mon, 23 Nov 2015 16:18:57 +0000 (16:18 +0000)]
Merge "printspooler.NotificationCOntroller: Remove deprecated APIs and silence other warnings."

8 years agoMerge "Move hiding of stack views into onStart from onResume."
Filip Gruszczynski [Mon, 23 Nov 2015 16:12:14 +0000 (16:12 +0000)]
Merge "Move hiding of stack views into onStart from onResume."

8 years agoMerge "Fix docs build failure."
Niels Egberts [Mon, 23 Nov 2015 15:40:23 +0000 (15:40 +0000)]
Merge "Fix docs build failure."

8 years agoFix docs build failure.
Niels Egberts [Mon, 23 Nov 2015 15:24:04 +0000 (15:24 +0000)]
Fix docs build failure.

Change-Id: If8d215f34a48e0c61aec0d35f10f1bfd633a4254

8 years agoMerge "Fix doc for EXTRA_PROVISIONING_COLOR."
Nicolas Prévot [Mon, 23 Nov 2015 15:15:08 +0000 (15:15 +0000)]
Merge "Fix doc for EXTRA_PROVISIONING_COLOR."

8 years agoMerge "Add work contacts directory support in Quick Contacts API"
Ricky Wai [Mon, 23 Nov 2015 14:50:06 +0000 (14:50 +0000)]
Merge "Add work contacts directory support in Quick Contacts API"

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 23 Nov 2015 14:06:13 +0000 (14:06 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 14:03:16 +0000 (06:03 -0800)]
Import translations. DO NOT MERGE

Change-Id: I870906bccabd39a122bcc6e0d8000cc8559fba78
Auto-generated-cl: translation import

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 23 Nov 2015 14:00:13 +0000 (14:00 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE am: b21b778567 -s ours am: b96f640a77 -s ours...
Geoff Mendal [Mon, 23 Nov 2015 13:58:31 +0000 (13:58 +0000)]
Import translations. DO NOT MERGE am: b21b778567  -s ours am: b96f640a77  -s ours am: 816a167b29  -s ours
am: e309a7f951  -s ours

* commit 'e309a7f951aa2c6bc0337a1324cbb237c641d8ca':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 23 Nov 2015 13:57:17 +0000 (13:57 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 13:51:56 +0000 (05:51 -0800)]
Import translations. DO NOT MERGE

Change-Id: I852a848512375e624b758709aa12aacdb7fb98b2
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE am: b21b778567 -s ours am: b96f640a77 -s ours
Geoff Mendal [Mon, 23 Nov 2015 13:51:05 +0000 (13:51 +0000)]
Import translations. DO NOT MERGE am: b21b778567  -s ours am: b96f640a77  -s ours
am: 816a167b29  -s ours

* commit '816a167b2936a420d96f57f57005982e727745f5':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 13:48:40 +0000 (05:48 -0800)]
Import translations. DO NOT MERGE

Change-Id: I46e625b01bd8cdec98ad7c097c4c12e1e211f6d2
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE am: b21b778567 -s ours
Geoff Mendal [Mon, 23 Nov 2015 13:43:48 +0000 (13:43 +0000)]
Import translations. DO NOT MERGE am: b21b778567  -s ours
am: b96f640a77  -s ours

* commit 'b96f640a77b0c09868e104028d3bb9db3687018b':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 13:36:02 +0000 (13:36 +0000)]
Import translations. DO NOT MERGE
am: b21b778567  -s ours

* commit 'b21b7785678f08e939dbe2e7d7cb5eedae47e1c4':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 13:33:01 +0000 (05:33 -0800)]
Import translations. DO NOT MERGE

Change-Id: I5eb347309ecaa015fb1486196e7600ab98d06b67
Auto-generated-cl: translation import

8 years agoAdd work contacts directory support in Quick Contacts API
Ricky Wai [Fri, 20 Nov 2015 16:07:15 +0000 (16:07 +0000)]
Add work contacts directory support in Quick Contacts API

Bug: 25764505

Change-Id: I61f9d13ea03352e3df1686ee4b3bcc43e9a9a760