OSDN Git Service
Benjamin Franz [Wed, 1 Jun 2016 17:13:14 +0000 (17:13 +0000)]
Merge "Add an intent extra to force master clear" into nyc-mr1-dev
Mady Mellor [Wed, 1 Jun 2016 17:06:26 +0000 (17:06 +0000)]
Merge "Adds alpha to dimmed backgrounds" into nyc-dev
am:
0d7dbb0f28
* commit '
0d7dbb0f282afb43ec2a6a81789379749b2ab054':
Adds alpha to dimmed backgrounds
Change-Id: I1ae5d761387b9eb9b9eb42c1eea65275b63eed64
fionaxu [Wed, 1 Jun 2016 16:55:51 +0000 (16:55 +0000)]
Merge "trim and strip html tags for load safe label name" into nyc-dev
am:
c16bc88fc9
* commit '
c16bc88fc99a6446c77d0b075f242c042bb31ded':
trim and strip html tags for load safe label name
Change-Id: Ic79f077813fcf2124fe1cbf031cb4e0770a02a51
Mady Mellor [Wed, 1 Jun 2016 16:53:49 +0000 (16:53 +0000)]
Merge "Adds alpha to dimmed backgrounds" into nyc-dev
Chen Xu [Wed, 1 Jun 2016 16:47:17 +0000 (16:47 +0000)]
Merge "trim and strip html tags for load safe label name" into nyc-dev
Dianne Hackborn [Wed, 1 Jun 2016 16:38:12 +0000 (16:38 +0000)]
Merge "Work on issue #
28942589: Tune job scheduler" into nyc-dev
am:
438693dd6c
* commit '
438693dd6cc4e3fe2ffb336d551c0d69e9546102':
Work on issue #
28942589: Tune job scheduler
Change-Id: I8264ce4204762358ccbf893e7846434eed258a22
Dianne Hackborn [Wed, 1 Jun 2016 16:27:04 +0000 (16:27 +0000)]
Merge "Work on issue #
28942589: Tune job scheduler" into nyc-dev
Bill Yi [Wed, 1 Jun 2016 15:35:03 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
a007e877f2 -s ours
* commit '
a007e877f2ed32bd51d6c03e94e20eac94ef4081':
Import translations. DO NOT MERGE
Change-Id: Ic0ab9aacb14fb341186d8c204f8595cd4087ae6a
Bill Yi [Wed, 1 Jun 2016 15:34:50 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
f9a6f33091 -s ours
* commit '
f9a6f33091772b847cf1580021530cdf5004c035':
Import translations. DO NOT MERGE
Change-Id: I19a2537c01efc8b4e47d64778d675bbed498b782
Bill Yi [Wed, 1 Jun 2016 15:34:37 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
072150db89 -s ours
* commit '
072150db89de9fda26bd2150242ab31f9309ec70':
Import translations. DO NOT MERGE
Change-Id: Ic78cdd6faee5831d7fa1a62d3cca0c49f1e0ad1a
TreeHugger Robot [Wed, 1 Jun 2016 15:26:42 +0000 (15:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:25:52 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:25:34 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:25:14 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:16:49 +0000 (15:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:15:57 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Benjamin Franz [Thu, 26 May 2016 13:24:29 +0000 (14:24 +0100)]
Add an intent extra to force master clear
Currently, if a priv-app sends ACTION_MASTER_CLEAR, whilst
DISALLOW_FACTORY_RESET is set, the factory reset is blocked. This CL
introduces a new extra for master clear that let's the priv-app bypass
the user restriction.
Bug:
28689894
Change-Id: I4bf979a3826454e977f1abff4562f85c8d0eec4a
Chris Banes [Wed, 1 Jun 2016 13:53:58 +0000 (13:53 +0000)]
Fix action mode animation on recreations - framework edition
am:
e65b3fbb63
* commit '
e65b3fbb63b4b6937fede2e4b889c0a51a881358':
Fix action mode animation on recreations - framework edition
Change-Id: I19274b7ede1fae09deb915807c35a478caf939ee
Chris Banes [Wed, 1 Jun 2016 10:39:54 +0000 (11:39 +0100)]
Fix action mode animation on recreations - framework edition
Currently if an action mode is started in onCreate()
it will fade in. This isn't ideal though, especially
since Activities are recreated routinely with
multi-window and resizable Activities. In that instance
we fade it in on every recreate.
This CL fixes this in both the decor and toolbar action
modes to only fade in if the decor has been laid out.
BUG:
29036694
Change-Id: Iae985efcced170a0a4229124c1c132355c2aa71e
Bill Yi [Wed, 1 Jun 2016 13:15:34 +0000 (06:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1e9a73431f13e4ccab446571ec51524eb5a3a165
Auto-generated-cl: translation import
Bill Yi [Wed, 1 Jun 2016 13:09:15 +0000 (06:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia172193f8f33ba21461ea85c092248433d254780
Auto-generated-cl: translation import
Bill Yi [Wed, 1 Jun 2016 09:01:08 +0000 (02:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I825eb779a66d54e72adca353cc52fbdeaf2921ae
Auto-generated-cl: translation import
Bill Yi [Wed, 1 Jun 2016 08:51:04 +0000 (01:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I95a9ffff8b53c291bd9eb314641b310c4ca1cbad
Auto-generated-cl: translation import
Bill Yi [Wed, 1 Jun 2016 08:38:57 +0000 (01:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I637f5ffcfb514015ac00e23b2a8e0c592c2958a4
Auto-generated-cl: translation import
Bill Yi [Wed, 1 Jun 2016 08:19:56 +0000 (01:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib90c671ec93583cc219bfc9bb18f199c71963f04
Auto-generated-cl: translation import
Wei Wang [Wed, 1 Jun 2016 03:06:36 +0000 (03:06 +0000)]
Merge "Trigger power hints for activity launch" into nyc-mr1-dev
fionaxu [Tue, 31 May 2016 21:47:14 +0000 (14:47 -0700)]
trim and strip html tags for load safe label name
Bug:
28557603
Change-Id: I30b6c1d32e97c1fb71ba83c2845c310fe3b7f579
Wei Wang [Wed, 18 May 2016 18:32:52 +0000 (11:32 -0700)]
Trigger power hints for activity launch
BUG:
28220567
Change-Id: Id2a0397efd1dd02ee50d5626edaed9e60ea6de8a
Andrii Kulian [Wed, 1 Jun 2016 01:20:50 +0000 (01:20 +0000)]
Merge "Update override config to include some changes from global config" into nyc-dev
am:
88be465ce5
* commit '
88be465ce572f84649e01744a7ec96b6346b3686':
Update override config to include some changes from global config
Change-Id: I2b15d9856f87e66ae9eb1ab6c9b84f7ac3add2ce
Dianne Hackborn [Sat, 28 May 2016 00:59:40 +0000 (17:59 -0700)]
Work on issue #
28942589: Tune job scheduler
We now have a new settings key that provides all of the existing
tuning parameters, plus some newly redone ones for dealing with
different memory levels.
Changed the minimum batching for overall jobs from 2 to 1, so
we will never get in the way of immediately scheduling jobs
when the developer asks for this. We should now be able to rely
on the doze modes to do better batching of jobs for us when it
is really important.
Also work on issue #
28981330: Excessive JobScheduler wakeup alarms.
Use a work source with scheduled alarms to blame them on the app
whose job they are being scheduled for, and add a check for whether
a job's timing constraint has been satisfied before considering it
a possible candidate for the next alarm. (If it is satisified,
the time is in the past, so we should not schedule an alarm for it.)
Finally clean up a bunch of the dumpsys output to make it easier
to understand.
Change-Id: I06cf2c1310448f47cf386f393e9b267335fabaeb
Andrii Kulian [Wed, 1 Jun 2016 01:08:36 +0000 (01:08 +0000)]
Merge "Update override config to include some changes from global config" into nyc-dev
Lajos Molnar [Wed, 1 Jun 2016 01:05:47 +0000 (01:05 +0000)]
Merge "media: avoid recursion when evaluating profile support" into nyc-dev
am:
a72a83a172
* commit '
a72a83a1724d1a2b047fdbb8ab343db6b9b4b7ae':
media: avoid recursion when evaluating profile support
Change-Id: I2ba4a9e16b1989cb05291f9db2412c61bf3e2d07
TreeHugger Robot [Wed, 1 Jun 2016 00:58:28 +0000 (00:58 +0000)]
Merge "media: avoid recursion when evaluating profile support" into nyc-dev
Hall Liu [Wed, 1 Jun 2016 00:33:39 +0000 (00:33 +0000)]
Merge "Add null check in showLockTaskToast" into nyc-dev
am:
d7007923c5
* commit '
d7007923c55994d64514706b212fa3e8c1a3b25f':
Add null check in showLockTaskToast
Change-Id: Ieba238cbc0cc0ae36ec6cab942cbe98e55600fcb
Hall Liu [Wed, 1 Jun 2016 00:25:04 +0000 (00:25 +0000)]
Merge "Add null check in showLockTaskToast" into nyc-dev
sergeyv [Wed, 1 Jun 2016 00:20:56 +0000 (00:20 +0000)]
Merge "HWUI: do nothing in case of empty layer" into nyc-dev
am:
21a608f27f
* commit '
21a608f27f1f7b9c0fcfbb982f290fed29cc1817':
HWUI: do nothing in case of empty layer
Change-Id: Iec199a2a20c9981922468c3a33065a86f818d833
Sergei Vasilinetc [Wed, 1 Jun 2016 00:15:30 +0000 (00:15 +0000)]
Merge "HWUI: do nothing in case of empty layer" into nyc-dev
Lajos Molnar [Tue, 31 May 2016 23:02:57 +0000 (16:02 -0700)]
media: avoid recursion when evaluating profile support
Bug:
28671284
Bug:
29041205
Change-Id: Ia9b3596a122bd5ba554a4b4ede875ebcadc67b67
Christopher Tate [Tue, 31 May 2016 23:13:20 +0000 (23:13 +0000)]
Merge "Don\'t bother with WeakHashMap for direct alarm bookkeeping" into nyc-dev
am:
cd0aa9cda8
* commit '
cd0aa9cda8e57c224b473198a345fb008fe30b5a':
Don't bother with WeakHashMap for direct alarm bookkeeping
Change-Id: I3b28a8c03cee7fe6f85540f1f679de10de09923c
Jorim Jaggi [Tue, 31 May 2016 23:02:23 +0000 (23:02 +0000)]
Merge "Enforce background fallback to be non-translucent" into nyc-dev
am:
a35724f666
* commit '
a35724f6667e80abc5e6b45e75d7000d3fb17267':
Enforce background fallback to be non-translucent
Change-Id: If68ead500309566e66230b079f71667e0d555be0
Chris Tate [Tue, 31 May 2016 22:59:24 +0000 (22:59 +0000)]
Merge "Don't bother with WeakHashMap for direct alarm bookkeeping" into nyc-dev
Hall Liu [Tue, 31 May 2016 22:50:48 +0000 (15:50 -0700)]
Add null check in showLockTaskToast
Bug:
29056498
Change-Id: Ic4333ec4f43e3c2916a4963b5ddf9e6ad10136ed
Jorim Jaggi [Tue, 31 May 2016 22:50:08 +0000 (22:50 +0000)]
Merge "Enforce background fallback to be non-translucent" into nyc-dev
Christopher Tate [Tue, 31 May 2016 22:08:04 +0000 (15:08 -0700)]
Don't bother with WeakHashMap for direct alarm bookkeeping
Call cancel() explicitly before dropping local references to your
callback objects; they won't just quietly go away.
Bug
28987260
Change-Id: Id9da66ed86a46b4fb38127e2ddd7a7d84fd2313a
Steve McKay [Tue, 31 May 2016 22:10:08 +0000 (22:10 +0000)]
Merge "Don\'t assert on uris with stack." into nyc-dev
am:
760b557158
* commit '
760b5571582056e756d9fb1bc366247bc26a8e54':
Don't assert on uris with stack.
Change-Id: I888984060b578ecff9dfefc70e6adacafe49e14c
TreeHugger Robot [Tue, 31 May 2016 22:03:27 +0000 (22:03 +0000)]
Merge "Don't assert on uris with stack." into nyc-dev
Joe Onorato [Tue, 31 May 2016 21:50:18 +0000 (21:50 +0000)]
Merge "Turn this wtf into just a log." into nyc-dev
am:
1755dd08cb
* commit '
1755dd08cbcdd2ffb14ac2eb84edc663843ced24':
Turn this wtf into just a log.
Change-Id: I6e4a129e2ba7ea6d23e5d3a07b120278a373ed10
TreeHugger Robot [Tue, 31 May 2016 21:42:45 +0000 (21:42 +0000)]
Merge "Turn this wtf into just a log." into nyc-dev
George Mount [Tue, 31 May 2016 21:37:51 +0000 (21:37 +0000)]
Merge "Better handling of confused finish transition." into nyc-dev
am:
2fd9cd7cbb
* commit '
2fd9cd7cbb7a792d041d0e0780b11b12b4591a90':
Better handling of confused finish transition.
Change-Id: I27914d6161ab68ce236b9d15e5d07c71889edb4e
TreeHugger Robot [Tue, 31 May 2016 21:31:28 +0000 (21:31 +0000)]
Merge "Better handling of confused finish transition." into nyc-dev
sergeyv [Tue, 31 May 2016 21:18:02 +0000 (14:18 -0700)]
HWUI: do nothing in case of empty layer
bug:
28862058
Change-Id: I8e09a5c33d0eb00a829be4df706dab49cad48b1e
Todd Kennedy [Tue, 31 May 2016 21:14:37 +0000 (21:14 +0000)]
Merge "Remove STOPSHIP" into nyc-dev
am:
1c39a112b4
* commit '
1c39a112b43e50da4e801d634e28ae7a130c0dcb':
Remove STOPSHIP
Change-Id: Icc176dca4735f3b03c8e1b47015792ecc202d398
Todd Kennedy [Tue, 31 May 2016 21:07:33 +0000 (21:07 +0000)]
Merge "Remove STOPSHIP" into nyc-dev
Sharvil Nanavati [Tue, 31 May 2016 21:03:45 +0000 (21:03 +0000)]
Merge "Clean up Bluetooth test code." into nyc-mr1-dev
Adrian Roos [Tue, 31 May 2016 20:59:07 +0000 (20:59 +0000)]
Merge "Fix crash with intent-less actions" into nyc-dev
am:
ac2b44f502
* commit '
ac2b44f5021f6d863c37167b26fe7dfba9bc4c6f':
Fix crash with intent-less actions
Change-Id: Ifa3e489a206c04b43d9747bd260156e346111d3e
Adrian Roos [Tue, 31 May 2016 20:51:49 +0000 (20:51 +0000)]
Merge "Fix crash with intent-less actions" into nyc-dev
Steve McKay [Tue, 31 May 2016 17:54:23 +0000 (10:54 -0700)]
Don't assert on uris with stack.
This is legal arrangement when viewing Archives.
Bug:
28923366
Change-Id: I75a26edc8dac865f536a7c5bcdef1ba00b0883f0
(cherry picked from commit
a379fad3b9b9e708e9211f7c026ddd13572fc16e)
Jorim Jaggi [Tue, 31 May 2016 20:16:13 +0000 (20:16 +0000)]
Merge "Fix multi-window enter animation" into nyc-dev
am:
0c54d2c391
* commit '
0c54d2c391b6d781fc660646e731f562bcd7037f':
Fix multi-window enter animation
Change-Id: I85cb5a7ee1ce17e21bb52052c77352e065354734
Andrii Kulian [Sat, 28 May 2016 00:30:16 +0000 (17:30 -0700)]
Update override config to include some changes from global config
In override config for task we set Configuration#screenLayout field based on
initial global config + shrink to fit the area on screen given for this task.
However this field also contains information (like layout direction) that we
do not intend to override and it can be changed in global config separately.
In this case we need to update the override config with changes from global
config.
Bug:
28616488
Change-Id: I22673257621b3f9ae7933b37bd0fb9446c6042ea
Jorim Jaggi [Tue, 31 May 2016 20:08:49 +0000 (20:08 +0000)]
Merge "Fix multi-window enter animation" into nyc-dev
Jorim Jaggi [Wed, 25 May 2016 23:41:49 +0000 (16:41 -0700)]
Enforce background fallback to be non-translucent
To avoid screen garbage or wallpaper shining through, the background
we use there for filling the whole needs to
a) Be non-translucent in all cases except if the window is translucent.
b) Don't infer it from the theme as it might be unexpected. Don't define
it in the theme, and use black if it's not defined.
Bug:
28763785
Change-Id: Ifb724b5c5feea3ed70d68e5bd7615fa91185e743
George Mount [Tue, 31 May 2016 19:58:52 +0000 (12:58 -0700)]
Better handling of confused finish transition.
Bug
28347277
When an activity calls startActivity with makeSceneTransitionAnimation
and then calls finishAfterTransition, it should not do any transition
and just finish.
Change-Id: I00e537638fa6f24c95605f09bbafd843b569bb4d
Selim Cinek [Tue, 31 May 2016 19:36:21 +0000 (19:36 +0000)]
Merge "Fixed a few accessibility issues with notifications and groups" into nyc-dev
am:
ddc6de1eda
* commit '
ddc6de1eda495790e6564438994df5d49ddf248f':
Fixed a few accessibility issues with notifications and groups
Change-Id: Ieec9526a2c54edd2f0d3b34973cc61f610f452ae
Selim Cinek [Tue, 31 May 2016 19:26:14 +0000 (19:26 +0000)]
Merge "Fixed a few accessibility issues with notifications and groups" into nyc-dev
Yigit Boyar [Tue, 31 May 2016 19:26:09 +0000 (19:26 +0000)]
Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev
am:
bb039d2f17
* commit '
bb039d2f17d61b96c88d2cae445a53a642fb421f':
Invalidate child bounds when AbsListView bounds change
Change-Id: I204f80216fb0594b7c7cb6070add58e91003b7a7
Yigit Boyar [Tue, 31 May 2016 19:20:19 +0000 (19:20 +0000)]
Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev
sreevanis [Tue, 31 May 2016 18:50:20 +0000 (18:50 +0000)]
Updated image sizes and wrapped text around images. am:
1ce2279423 am:
2cbac3c122
am:
9801a9269c
* commit '
9801a9269c6fcdc9996fb752b2421eb409fc3b09':
Updated image sizes and wrapped text around images.
Change-Id: I82a1e05d0c1da0560dff4199c36ce75f094064a0
sreevanis [Tue, 31 May 2016 18:45:36 +0000 (18:45 +0000)]
Updated image sizes and wrapped text around images. am:
1ce2279423
am:
2cbac3c122
* commit '
2cbac3c122e1114f72ef44c3e62c8ec7c372db94':
Updated image sizes and wrapped text around images.
Change-Id: Ie0df8af83058bf81a71f6fb75cb71b453ad9f47e
Christopher Tate [Tue, 31 May 2016 18:42:03 +0000 (18:42 +0000)]
Merge "Build JobStatus objects outside the lock" into nyc-dev
am:
87ad1fce25
* commit '
87ad1fce254bdb398c5a33753f0368a596fd81f0':
Build JobStatus objects outside the lock
Change-Id: I91f11f9de40e5d8cfa8c5619796dedd56c490eb5
sreevanis [Tue, 31 May 2016 18:39:38 +0000 (18:39 +0000)]
Updated image sizes and wrapped text around images.
am:
1ce2279423
* commit '
1ce2279423a544d431bf6b64f2bfeb1a4617120b':
Updated image sizes and wrapped text around images.
Change-Id: I61e1bb43a0b32ca80e0875e375c746fc930c85cb
Chris Tate [Tue, 31 May 2016 18:36:48 +0000 (18:36 +0000)]
Merge "Build JobStatus objects outside the lock" into nyc-dev
sreevanis [Thu, 19 May 2016 21:15:14 +0000 (14:15 -0700)]
Updated image sizes and wrapped text around images.
Fixed messagingstyle link in api-overview page.
Bug:
28864173
Change-Id: I2e1a6036010b2e3aea8104e51e37a1697906691c
Joe Onorato [Tue, 31 May 2016 17:49:08 +0000 (10:49 -0700)]
Turn this wtf into just a log.
We're seeing this a bunch, but the overhead from the WTF is concerning.
So turn it off. It means that somewhere there is a race in tearing
down the app, or maybe some place fails to call back in some scenario.
Bug:
28932059
Change-Id: Ice14ade95bb9377ad622d440fb022953ad51c34c
Hall Liu [Tue, 31 May 2016 17:37:37 +0000 (17:37 +0000)]
Merge "Disable app pinning when emergency call button pressed" into nyc-dev
am:
8b655e0f57
* commit '
8b655e0f57b071756e7d6a3547eeabe35885bcc9':
Disable app pinning when emergency call button pressed
Change-Id: Ibe8d37716ad1630359b3ef08350f485b0d1177a7
Ricky Wai [Tue, 31 May 2016 17:37:33 +0000 (17:37 +0000)]
Merge "Do not get device owner admin info when device owner is null" into nyc-dev
am:
21f98459b7
* commit '
21f98459b7740f57f6fd0415298cb5f5c0c7e0ae':
Do not get device owner admin info when device owner is null
Change-Id: Iae5d7d5f9e5f5cf23d8c02bf9a4322e4569be9de
Hall Liu [Tue, 31 May 2016 17:29:35 +0000 (17:29 +0000)]
Merge "Disable app pinning when emergency call button pressed" into nyc-dev
Daniel Yu [Tue, 31 May 2016 17:25:26 +0000 (17:25 +0000)]
Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am:
160ce9413c am:
2ad3221e5f
am:
24d5e1b9ec
* commit '
24d5e1b9ec676eea4cb803f584dec3dadc170ab8':
docs: Updating GuidedStepFragment for 23.2, new action types
Change-Id: I269a97d21f165148512cd6a76a262839bb659a41
Ricky Wai [Tue, 31 May 2016 17:22:54 +0000 (17:22 +0000)]
Merge "Do not get device owner admin info when device owner is null" into nyc-dev
Dan Yu [Tue, 31 May 2016 17:21:48 +0000 (17:21 +0000)]
Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs am:
160ce9413c
am:
2ad3221e5f
* commit '
2ad3221e5f982dd0b9213c7e600d6186a1a9ea23':
docs: Updating GuidedStepFragment for 23.2, new action types
Change-Id: Iaf555b61ddb9fc6706a67775e76106c8187b4d27
Daniel Yu [Tue, 31 May 2016 17:17:18 +0000 (17:17 +0000)]
Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs
am:
160ce9413c
* commit '
160ce9413ccd5cef62b01f2e7e7fb601c5e8fbf2':
docs: Updating GuidedStepFragment for 23.2, new action types
Change-Id: I646cb0a2e9ecc0f783444bb8b63334a37c6e22df
Dan Yu [Tue, 31 May 2016 17:09:23 +0000 (17:09 +0000)]
Merge "docs: Updating GuidedStepFragment for 23.2, new action types" into mnc-io-docs
Ricky Wai [Tue, 31 May 2016 16:48:23 +0000 (17:48 +0100)]
Do not get device owner admin info when device owner is null
Bug:
29043723
Change-Id: I355c549f891a5e71f654f42ed16a7139da86482a
Jason Monk [Tue, 31 May 2016 14:39:05 +0000 (14:39 +0000)]
Merge "QS: Update layout to show gear all the time" into nyc-mr1-dev
Jason Monk [Fri, 27 May 2016 19:19:15 +0000 (15:19 -0400)]
QS: Update layout to show gear all the time
Because evidently, when you've gotta change something, you've really
gotta change something.
Bug:
28673919
Change-Id: I085a0424c134a7f80316397b04a6b120440d32c8
Nicolas Geoffray [Tue, 31 May 2016 11:36:38 +0000 (11:36 +0000)]
Merge "Look at last used app when filtering." into nyc-dev
am:
ce289e937e
* commit '
ce289e937ee6b001cd14824e5dec3c6010b51e61':
Look at last used app when filtering.
Change-Id: I7c1c693cc76d5067733e5b424dbdac1dcb55c288
Nicolas Geoffray [Tue, 31 May 2016 11:36:34 +0000 (11:36 +0000)]
Merge "Cleanup performDexOpt with instruction sets." into nyc-dev
am:
89f4bff149
* commit '
89f4bff149c62baf8371118aed2c4e6ac29976c5':
Cleanup performDexOpt with instruction sets.
Change-Id: Id973c65cbe87f54a743bfcb89fbe7e4aea45d1c8
TreeHugger Robot [Tue, 31 May 2016 11:29:39 +0000 (11:29 +0000)]
Merge "Look at last used app when filtering." into nyc-dev
TreeHugger Robot [Tue, 31 May 2016 11:23:43 +0000 (11:23 +0000)]
Merge "Cleanup performDexOpt with instruction sets." into nyc-dev
Nicolas Geoffray [Thu, 26 May 2016 13:20:49 +0000 (14:20 +0100)]
Look at last used app when filtering.
In order to cover cases where a device hasn't been used
for a while.
bug:
28969280
Change-Id: I897e833ed83912b848f25a7a81fe59f0ee655be1
Victor Chang [Tue, 31 May 2016 09:51:44 +0000 (09:51 +0000)]
Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev
am:
98801e9f2b
* commit '
98801e9f2bec03faf9be0c8bb961150004d309ff':
Finish ConfirmDialog when another vpn app is always-on
Change-Id: If8de5a6c200953599bc3965da57b0de2b1dfb76e
Victor Chang [Tue, 31 May 2016 09:43:35 +0000 (09:43 +0000)]
Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev
Victor Chang [Tue, 31 May 2016 08:33:08 +0000 (08:33 +0000)]
Merge "Fix VPN Request dialog appearing each time VPN is connecting" into nyc-dev
am:
76609106b7
* commit '
76609106b72e944eb87782f1c622519f98ff490f':
Fix VPN Request dialog appearing each time VPN is connecting
Change-Id: Ia3d8b743457a03d38f85442b3e66cab1285826c5
Victor Chang [Tue, 31 May 2016 08:21:22 +0000 (08:21 +0000)]
Merge "Fix VPN Request dialog appearing each time VPN is connecting" into nyc-dev
Victor Chang [Tue, 31 May 2016 06:19:27 +0000 (07:19 +0100)]
Finish ConfirmDialog when another vpn app is always-on
Bug:
29000925
Change-Id: I1087dbb2c366cebb4583ae0bb97302b3d2caf42c
Bill Yi [Tue, 31 May 2016 04:48:25 +0000 (04:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
e71cdef7e3 -s ours
* commit '
e71cdef7e307aff6326a5790d98a044bdfcec84c':
Import translations. DO NOT MERGE
Change-Id: I17af720d1549bc29d2f8a823d529d2d9429671ee
Bill Yi [Tue, 31 May 2016 04:06:21 +0000 (04:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
ae284e6cb6 -s ours
* commit '
ae284e6cb643236be307e78960e976d8266e8d2c':
Import translations. DO NOT MERGE
Change-Id: I65d0bb4ce8a10499a43e5935ccffca9bdcf42d0a
Bill Yi [Tue, 31 May 2016 04:06:13 +0000 (04:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
5854f2aa07 -s ours
* commit '
5854f2aa077e5ceba2977724f71162eaf3faa384':
Import translations. DO NOT MERGE
Change-Id: I565899541685a2f1951c35d8a07b4f29ca5eae3e
TreeHugger Robot [Tue, 31 May 2016 03:54:30 +0000 (03:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 31 May 2016 03:53:24 +0000 (03:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 31 May 2016 03:45:58 +0000 (03:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev