OSDN Git Service
Mady Mellor [Wed, 1 Jun 2016 17:06:24 +0000 (17:06 +0000)]
Merge "Adds alpha to dimmed backgrounds" into nyc-dev
am:
0d7dbb0f28
* commit '
0d7dbb0f282afb43ec2a6a81789379749b2ab054':
Adds alpha to dimmed backgrounds
Change-Id: Iebe58b6c0b8a1b030626e5bb581dfd2c92d17a7b
fionaxu [Wed, 1 Jun 2016 16:56:44 +0000 (16:56 +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: I34cebbce65db27304e6d3dcc2c6e0cbc0f005b03
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:18 +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: I9e4ddcc64d84a8d943128d8bd8ebf158743c5549
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:33:43 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
a007e877f2 -s ours
* commit '
a007e877f2ed32bd51d6c03e94e20eac94ef4081':
Import translations. DO NOT MERGE
Change-Id: I261c5b972c2cf481fcfd2cd69ae7b4803ca8fac1
Bill Yi [Wed, 1 Jun 2016 15:33:18 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
f9a6f33091 -s ours
* commit '
f9a6f33091772b847cf1580021530cdf5004c035':
Import translations. DO NOT MERGE
Change-Id: Id0b2e17995055d8d92b2e3f0d6a81e4a41fa55cb
Bill Yi [Wed, 1 Jun 2016 15:33:02 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
072150db89 -s ours
* commit '
072150db89de9fda26bd2150242ab31f9309ec70':
Import translations. DO NOT MERGE
Change-Id: I7c97e2bfe59959e888e22cf8b3304a51aee0a0c9
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:34 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:15:57 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Chris Banes [Wed, 1 Jun 2016 13:54:01 +0000 (13:54 +0000)]
Fix action mode animation on recreations - framework edition
am:
e65b3fbb63
* commit '
e65b3fbb63b4b6937fede2e4b889c0a51a881358':
Fix action mode animation on recreations - framework edition
Change-Id: Ic990cf5fdb98e86083ccfe54f8f3e6905aa3e375
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: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 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:19:56 +0000 (01:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib90c671ec93583cc219bfc9bb18f199c71963f04
Auto-generated-cl: translation import
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
Andrii Kulian [Wed, 1 Jun 2016 01:20:39 +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: I0f1f9f64bcd81321f44c48cd01537749ac4727ea
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:30 +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: I41d6aac773ab5c31b700eea343d9a143934c2f6b
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:45 +0000 (00:33 +0000)]
Merge "Add null check in showLockTaskToast" into nyc-dev
am:
d7007923c5
* commit '
d7007923c55994d64514706b212fa3e8c1a3b25f':
Add null check in showLockTaskToast
Change-Id: I10339eddb06dab3acd2d2d770e4b678ef0cfe2f3
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:54 +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: I264e20e2290f474636a21eb7322377e308d316c2
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:31 +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: Ia86b5f27d511bb8da2bd8982ffe35d4d2906da54
Jorim Jaggi [Tue, 31 May 2016 23:02:53 +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: I692f30718453e03570e1512adb3b6e9fbe787197
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:07 +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: Id18689de7d04ae2627ea64612fe7fd8f2ac5f445
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:21 +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: I20cfd2c9ec4c6d95d6e638aff7955324d98f1495
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:38:07 +0000 (21:38 +0000)]
Merge "Better handling of confused finish transition." into nyc-dev
am:
2fd9cd7cbb
* commit '
2fd9cd7cbb7a792d041d0e0780b11b12b4591a90':
Better handling of confused finish transition.
Change-Id: I0b43e01df97b98a7b646999999611c7aafbea33a
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:28 +0000 (21:14 +0000)]
Merge "Remove STOPSHIP" into nyc-dev
am:
1c39a112b4
* commit '
1c39a112b43e50da4e801d634e28ae7a130c0dcb':
Remove STOPSHIP
Change-Id: I15ad40f01dd8bb86f1f64af67760de2a6e1db535
Todd Kennedy [Tue, 31 May 2016 21:07:33 +0000 (21:07 +0000)]
Merge "Remove STOPSHIP" into nyc-dev
Adrian Roos [Tue, 31 May 2016 20:59:16 +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: Ia0835af917c5818ec90fc96691d512c98e89d7e0
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:17:07 +0000 (20:17 +0000)]
Merge "Fix multi-window enter animation" into nyc-dev
am:
0c54d2c391
* commit '
0c54d2c391b6d781fc660646e731f562bcd7037f':
Fix multi-window enter animation
Change-Id: I89b75e2ab9b8fa5a628e77ed9ebd09b70f6a2dc4
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:27 +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: Iaa2ddc8bedaad3623190e65116f0d8b85687eb78
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:11 +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: I5d139388bea3610d2e1de2ded48ae7a510d2aba7
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:11 +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: I38c62368040c897d9c1ea1875a1951b2801b4df2
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:09 +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: I41a7cd9fcf04e0ad40334e4a470a028bbb871752
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
Vasco Brito [Tue, 31 May 2016 18:18:57 +0000 (18:18 +0000)]
Merge "Add 900 for Russia - Short code used by Sberbank." am:
9a769a4828
am:
29760d459a
* commit '
29760d459a59e916b7f6f2bbe36ba955896ecbad':
Add 900 for Russia - Short code used by Sberbank.
Change-Id: I6d25ad6cb6a68fcb7071e331ca6ae30a811814cd
Vasco Brito [Tue, 31 May 2016 18:10:42 +0000 (18:10 +0000)]
Merge "Add 900 for Russia - Short code used by Sberbank."
am:
9a769a4828
* commit '
9a769a482861496686a4138a0a9b612a08fce8f8':
Add 900 for Russia - Short code used by Sberbank.
Change-Id: I0eac4eb99a84a489c1907a3d1fd4dd944527404e
Treehugger Robot [Tue, 31 May 2016 18:06:29 +0000 (18:06 +0000)]
Merge "Add 900 for Russia - Short code used by Sberbank."
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:35:12 +0000 (17:35 +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: I37575e58b60e2da8422732e9bb0359b0b6ff01a8
Ricky Wai [Tue, 31 May 2016 17:30:54 +0000 (17:30 +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: I8bca370306be7cafe536dc57d1b1d53dd0f50297
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:23 +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: I72a5254fcc594069c8ecdba4ce2f496856702797
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
Vasco Brito [Tue, 24 May 2016 18:23:20 +0000 (19:23 +0100)]
Add 900 for Russia - Short code used by Sberbank.
Sberbank SMS banking solution uses 900 short code.
They have requested this shortcode to be listed has premium to reduce banking fraud.
bug:
28423611
Change-Id: I82dfe012a1e55b2d025c24e50149fa01551a92ed
Signed-off-by: Vasco Brito <vascob@google.com>
Nicolas Geoffray [Tue, 31 May 2016 11:36:41 +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: Ia1ce20e1645ea5defce3f72011cacd88388cb3df
Nicolas Geoffray [Tue, 31 May 2016 11:36:37 +0000 (11:36 +0000)]
Merge "Cleanup performDexOpt with instruction sets." into nyc-dev
am:
89f4bff149
* commit '
89f4bff149c62baf8371118aed2c4e6ac29976c5':
Cleanup performDexOpt with instruction sets.
Change-Id: I6293cb0c9adf562d69aac59d74edc6540e6a0693
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:58 +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: I84db62a24c34bf8dea6f99d34e108cbb0fc0517f
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:27:50 +0000 (08:27 +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: I67f2434f144ec1eca21092da8b757507072c937d
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:50:22 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
e71cdef7e3 -s ours
* commit '
e71cdef7e307aff6326a5790d98a044bdfcec84c':
Import translations. DO NOT MERGE
Change-Id: I2180ff991e0f2a3969dc13b44931a9cf6a639f24
Bill Yi [Tue, 31 May 2016 04:50:16 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
ae284e6cb6 -s ours
* commit '
ae284e6cb643236be307e78960e976d8266e8d2c':
Import translations. DO NOT MERGE
Change-Id: Ib50a2d6669eec4e8c2185d056712700f0ebd5d21
Bill Yi [Tue, 31 May 2016 04:50:12 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
5854f2aa07 -s ours
* commit '
5854f2aa077e5ceba2977724f71162eaf3faa384':
Import translations. DO NOT MERGE
Change-Id: I8e1a06a15432d0599f86bba7c42d7e9d1f2fcd38
Roozbeh Pournader [Tue, 31 May 2016 04:49:59 +0000 (04:49 +0000)]
Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev
am:
fe524c0e24
* commit '
fe524c0e24ba2dc65c9ea490b2334a039c1b0a6a':
Support ellipsizing LocaleHelper.getDisplayLocaleList()
Change-Id: I98301daa256ab8e8dc2dc05c1e877f39ef685c23
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:45:58 +0000 (03:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 31 May 2016 03:45:42 +0000 (03:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 31 May 2016 01:11:25 +0000 (18:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I55d645f1ec4661ef1db9a650aa555178fc6ed6a5
Auto-generated-cl: translation import
Roozbeh Pournader [Tue, 31 May 2016 01:02:41 +0000 (01:02 +0000)]
Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev
Bill Yi [Tue, 31 May 2016 00:49:58 +0000 (17:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ieeea0ff0eefd470b6a929f69671ca10724990c88
Auto-generated-cl: translation import
Bill Yi [Mon, 30 May 2016 18:53:22 +0000 (11:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idaa6156bb45c7c8c23f7b9b66910bcbf7a774ab1
Auto-generated-cl: translation import
Victor Chang [Fri, 27 May 2016 16:30:49 +0000 (17:30 +0100)]
Fix VPN Request dialog appearing each time VPN is connecting
cause: ConfirmDialog is shown when prepareVpn(package, null)
returns false when the package is in always-on mode
We added the code in ag/949136 to stop app replacing app currently set to always-on.
Bug:
28941235
Change-Id: I370e56ad59332cc3fb722a98730fa73a97e26831
Greg Hackmann [Sat, 28 May 2016 16:41:13 +0000 (16:41 +0000)]
Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support"" am:
6fb921a61b
am:
359a4d9569
* commit '
359a4d9569fd88a896650065256e8a377546b8e2':
Revert "AlarmManagerService: remove legacy /dev/alarm support"
Change-Id: I0f1ed806b1261796da0dad770c50e8e1b9f5b3e1
Greg Hackmann [Sat, 28 May 2016 16:34:39 +0000 (16:34 +0000)]
Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support""
am:
6fb921a61b
* commit '
6fb921a61b0ca6bac8002e0fdbeb521453dce408':
Revert "AlarmManagerService: remove legacy /dev/alarm support"
Change-Id: I7cfaa210c181c9f3754727797609d3ed4ce3244e
Treehugger Robot [Sat, 28 May 2016 16:19:03 +0000 (16:19 +0000)]
Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support""