OSDN Git Service
Yigit Boyar [Tue, 2 Aug 2016 20:57:26 +0000 (20:57 +0000)]
Merge "Target API check for margin params fix" into nyc-mr1-dev am:
828d4ff61d
am:
8ef047b974
Change-Id: I2deda7bb163746fd2d2b3b17d63b8dfd8e27b7d2
Yigit Boyar [Tue, 2 Aug 2016 20:57:22 +0000 (20:57 +0000)]
Target API check for margin params fix am:
2dd20a61e9
am:
6efd207022
Change-Id: Ic05edff9014a74cd543d0eef03ba8862a198613a
Yigit Boyar [Tue, 2 Aug 2016 20:50:54 +0000 (20:50 +0000)]
Merge "Target API check for margin params fix" into nyc-mr1-dev
am:
828d4ff61d
Change-Id: Id289f1e8c41b02f76659aa04bed654f36e3aca9b
Yigit Boyar [Tue, 2 Aug 2016 20:50:52 +0000 (20:50 +0000)]
Target API check for margin params fix
am:
2dd20a61e9
Change-Id: I745d44946585e08143e76b7d9da1a7302b4d66b9
Doris Liu [Tue, 2 Aug 2016 20:50:03 +0000 (20:50 +0000)]
Merge "Ensure layer update include the dirty rect from AVD" into nyc-mr1-dev am:
a3c35852a1
am:
a57431ce2b
Change-Id: I0c6d4fedd1c02b45eda9cc46d675ffe40266bfa6
Doris Liu [Tue, 2 Aug 2016 20:49:53 +0000 (20:49 +0000)]
Ensure layer update include the dirty rect from AVD am:
b51b2864e8
am:
c0dccb9597
Change-Id: Ic18f7fde55b86aa4789b86188784d35d39a5c73a
Doris Liu [Tue, 2 Aug 2016 20:42:34 +0000 (20:42 +0000)]
Merge "Ensure layer update include the dirty rect from AVD" into nyc-mr1-dev
am:
a3c35852a1
Change-Id: I8c3929e8c7702dc126aa11c27cb9a36d0a9535b3
Doris Liu [Tue, 2 Aug 2016 20:42:31 +0000 (20:42 +0000)]
Ensure layer update include the dirty rect from AVD
am:
b51b2864e8
Change-Id: Ic8b6d70e9913205b4c34023ae10025171cb07311
Yigit Boyar [Tue, 2 Aug 2016 20:41:07 +0000 (20:41 +0000)]
Merge "Target API check for margin params fix" into nyc-mr1-dev
Doris Liu [Tue, 2 Aug 2016 20:36:19 +0000 (20:36 +0000)]
Merge "Ensure layer update include the dirty rect from AVD" into nyc-mr1-dev
Makoto Onuki [Tue, 2 Aug 2016 20:33:27 +0000 (20:33 +0000)]
Merge "ShortcutManager: rescan all apps after next OTA" into nyc-mr1-dev am:
f77b6620d1
am:
f58bd641f1
Change-Id: Id5a79c51d80659a26627223def4a443da46d42be
Makoto Onuki [Tue, 2 Aug 2016 20:33:19 +0000 (20:33 +0000)]
ShortcutManager: rescan all apps after next OTA am:
4dd032d5a6
am:
74f4689f34
Change-Id: Ibf7502b895ca544fec7491c1f667b8507d24340c
Makoto Onuki [Tue, 2 Aug 2016 20:27:43 +0000 (20:27 +0000)]
Merge "ShortcutManager: rescan all apps after next OTA" into nyc-mr1-dev
am:
f77b6620d1
Change-Id: If915a2f89d0d86df2867273aff4acc3301128ad7
Makoto Onuki [Tue, 2 Aug 2016 20:27:40 +0000 (20:27 +0000)]
ShortcutManager: rescan all apps after next OTA
am:
4dd032d5a6
Change-Id: I234d02e97d7d3dc671ab2b66cc7b37029bab0064
TreeHugger Robot [Tue, 2 Aug 2016 20:19:32 +0000 (20:19 +0000)]
Merge "ShortcutManager: rescan all apps after next OTA" into nyc-mr1-dev
Doris Ling [Tue, 2 Aug 2016 20:00:48 +0000 (20:00 +0000)]
Merge "Add metrics logging for fingerprint swipe for notification panel." into nyc-mr1-dev am:
174a074eb2
am:
d93396b4ec
Change-Id: I4b622a0c0d68032a7cf01823e73fb83d8f124419
Doris Ling [Tue, 2 Aug 2016 20:00:41 +0000 (20:00 +0000)]
Add metrics logging for fingerprint swipe for notification panel. am:
3c00afba0b
am:
ed1c7ba70e
Change-Id: Ie7bf96006e2d2ee9b6ef4e4acbd9d8cf9c169185
Doris Ling [Tue, 2 Aug 2016 19:55:12 +0000 (19:55 +0000)]
Merge "Add metrics logging for fingerprint swipe for notification panel." into nyc-mr1-dev
am:
174a074eb2
Change-Id: I8fa509ffe4e22a32ec1a7d6bfe7327d2c2be74f8
Doris Ling [Tue, 2 Aug 2016 19:55:09 +0000 (19:55 +0000)]
Add metrics logging for fingerprint swipe for notification panel.
am:
3c00afba0b
Change-Id: I67fea85d2e9d5b3f8e47ab9e5ecb246c401c0cad
Doris Ling [Tue, 2 Aug 2016 19:50:06 +0000 (19:50 +0000)]
Merge "Add metrics logging for fingerprint swipe for notification panel." into nyc-mr1-dev
Felipe Leme [Tue, 2 Aug 2016 19:22:38 +0000 (19:22 +0000)]
Merge "Removed redundant call to updateRulesForRestrictPowerUL()." into nyc-mr1-dev am:
ca69bd37a9
am:
0710ea46e6
Change-Id: Id8c9d50e40c847db4763b064f79a3a4f32776152
Felipe Leme [Tue, 2 Aug 2016 19:22:35 +0000 (19:22 +0000)]
Removed redundant call to updateRulesForRestrictPowerUL(). am:
7e6d8e2236
am:
893c6bd832
Change-Id: I679ce9027274f46657548550e4eaf48b3232d7a2
Adrian Roos [Tue, 2 Aug 2016 19:03:22 +0000 (19:03 +0000)]
Merge "SystemUI: Fix crash from bad notifications" into nyc-mr1-dev am:
87fab000c5
am:
eaf7018d07
Change-Id: I151679b04af1a83e050e22293c52e40843617133
Adrian Roos [Tue, 2 Aug 2016 19:03:18 +0000 (19:03 +0000)]
SystemUI: Fix crash from bad notifications am:
95f8bea461
am:
9385517f36
Change-Id: I1813bd64e62545d44302f1958aaa2fb16882e04f
Adrian Roos [Tue, 2 Aug 2016 19:03:13 +0000 (19:03 +0000)]
Merge "DozeLog: Properly initialize" into nyc-mr1-dev am:
9923784efc
am:
cae7484029
Change-Id: I69c39e32615f7721bffb0fcab1940ce398299cf6
Adrian Roos [Tue, 2 Aug 2016 19:03:10 +0000 (19:03 +0000)]
DozeLog: Properly initialize am:
23c14fc01c
am:
e4a4652a3a
Change-Id: I604ec4205474e7aedc93b372a302864af87e7a3d
Felipe Leme [Tue, 2 Aug 2016 19:02:10 +0000 (19:02 +0000)]
Merge "Removed redundant call to updateRulesForRestrictPowerUL()." into nyc-mr1-dev
am:
ca69bd37a9
Change-Id: Ic04cfc60d270a0c3323f5e5e5243446b2aa9df53
Felipe Leme [Tue, 2 Aug 2016 19:02:05 +0000 (19:02 +0000)]
Removed redundant call to updateRulesForRestrictPowerUL().
am:
7e6d8e2236
Change-Id: Iaab5f2eaf7b5764ab0e3146d3eefdfe69820bd85
Jorim Jaggi [Tue, 2 Aug 2016 18:53:34 +0000 (18:53 +0000)]
Merge changes I03844bce,I8035357c,Ibe7cb6df into nyc-mr1-dev am:
1340221244
am:
3e3896655d
Change-Id: If8640aa6db9ebfefabac21f6657e27c29f099d32
Jorim Jaggi [Tue, 2 Aug 2016 18:52:36 +0000 (18:52 +0000)]
Remove lock contention when unlocking users am:
6f4d7b39c1
am:
584e9b13ac
Change-Id: Iaf122afd622e20e2e8b77f73a07d01f6fdac0062
Jorim Jaggi [Tue, 2 Aug 2016 18:51:26 +0000 (18:51 +0000)]
Only get trace name if tracing is enabled am:
407c0be727
am:
ca023af1b0
Change-Id: I33bc9f81389cd3952f51e76514a5f1d871b4161a
Jorim Jaggi [Tue, 2 Aug 2016 18:50:50 +0000 (18:50 +0000)]
Fix multi-window drag jank if vsync-app is before vsync-sf am:
dbe6fdb05b
am:
876b9150c9
Change-Id: Id1a7129c233a31bc4821a2de3ec7243f4690cbca
Felipe Leme [Tue, 2 Aug 2016 18:50:46 +0000 (18:50 +0000)]
Merge "Use SurfaceControl.screenshot() instead of screencap for screenshots." into nyc-mr1-dev am:
f7ac45a33b
am:
edbb5d5612
Change-Id: I92825faf69ab77463065e48c85a19d01e04f9c8a
Felipe Leme [Tue, 2 Aug 2016 18:50:43 +0000 (18:50 +0000)]
Use SurfaceControl.screenshot() instead of screencap for screenshots. am:
aba9743643
am:
ce61b5715d
Change-Id: I743efe4fc79189b2377a7a5dc58f7214e737998f
TreeHugger Robot [Tue, 2 Aug 2016 18:49:05 +0000 (18:49 +0000)]
Merge "Removed redundant call to updateRulesForRestrictPowerUL()." into nyc-mr1-dev
Adrian Roos [Tue, 2 Aug 2016 18:48:55 +0000 (18:48 +0000)]
Merge "SystemUI: Fix crash from bad notifications" into nyc-mr1-dev
am:
87fab000c5
Change-Id: I91937edd386872e4ae62b56962bc5ed050024715
Adrian Roos [Tue, 2 Aug 2016 18:48:52 +0000 (18:48 +0000)]
SystemUI: Fix crash from bad notifications
am:
95f8bea461
Change-Id: Icaf44c7d8d82da61e74b9b56bc423d4a04022d01
Adrian Roos [Tue, 2 Aug 2016 18:48:48 +0000 (18:48 +0000)]
Merge "DozeLog: Properly initialize" into nyc-mr1-dev
am:
9923784efc
Change-Id: I6bbaa5460d75a82ad7f68d088adcd0410ac9cd94
Adrian Roos [Tue, 2 Aug 2016 18:48:46 +0000 (18:48 +0000)]
DozeLog: Properly initialize
am:
23c14fc01c
Change-Id: Idffafa088306a42bc7d935855c37b4210e6b9736
Makoto Onuki [Tue, 2 Aug 2016 18:39:19 +0000 (11:39 -0700)]
ShortcutManager: rescan all apps after next OTA
- Normally when a user is unlocked, SM scans all updated apps
since the last scan to see if their manifest shortcuts have changed.
- There was a known issue that's been fixed already that'd result
in all shortcuts being removed.
- To work around this issue, let's scan all packages after the next
user unlock.
- This can be done by just renaming the XML attribute name to persist
the last app scan time.
Bug
30591723
Change-Id: Ie9f723ef30a1c991990d981193841cb203c094ad
Jorim Jaggi [Tue, 2 Aug 2016 18:41:06 +0000 (18:41 +0000)]
Merge changes I03844bce,I8035357c,Ibe7cb6df into nyc-mr1-dev
am:
1340221244
Change-Id: I18d7d3168af5adfdc59cbb7f4a51d43337eb366b
Jorim Jaggi [Tue, 2 Aug 2016 18:41:04 +0000 (18:41 +0000)]
Remove lock contention when unlocking users
am:
6f4d7b39c1
Change-Id: I71a426b184dab8dab285a6d3607882d662624a90
Adrian Roos [Tue, 2 Aug 2016 18:40:41 +0000 (18:40 +0000)]
Merge "SystemUI: Fix crash from bad notifications" into nyc-mr1-dev
Jorim Jaggi [Tue, 2 Aug 2016 18:40:29 +0000 (18:40 +0000)]
Only get trace name if tracing is enabled
am:
407c0be727
Change-Id: I0906df5742eb1775fb80c08e99bbb9cf690f0c72
Jorim Jaggi [Tue, 2 Aug 2016 18:39:55 +0000 (18:39 +0000)]
Fix multi-window drag jank if vsync-app is before vsync-sf
am:
dbe6fdb05b
Change-Id: I99601ba82d9be3959dece64a23b3b2cc2daaf245
Adrian Roos [Tue, 2 Aug 2016 18:39:24 +0000 (18:39 +0000)]
Merge "DozeLog: Properly initialize" into nyc-mr1-dev
Felipe Leme [Tue, 2 Aug 2016 18:37:50 +0000 (18:37 +0000)]
Merge "Use SurfaceControl.screenshot() instead of screencap for screenshots." into nyc-mr1-dev
am:
f7ac45a33b
Change-Id: Ifb5ea273af0fcde967da148b205577f01e9d2025
Felipe Leme [Tue, 2 Aug 2016 18:37:48 +0000 (18:37 +0000)]
Use SurfaceControl.screenshot() instead of screencap for screenshots.
am:
aba9743643
Change-Id: Ie6761383247cd90d586b0b29866f49c8a7787282
Wei Liu [Tue, 2 Aug 2016 18:35:25 +0000 (18:35 +0000)]
Merge "Make NetworkOverLimitActivity and DataUsageSummaryActivity configurable" into cw-f-dev
am:
d752f11926
Change-Id: Ie3a141c86be93eb0ff9d5f5e4db899af3e20a455
Wei Liu [Tue, 2 Aug 2016 18:35:22 +0000 (18:35 +0000)]
Make NetworkOverLimitActivity and DataUsageSummaryActivity configurable
am:
546cb77123
Change-Id: I76d1bdd1b4d4a880bc550945db65168dc189f0df
Jorim Jaggi [Tue, 2 Aug 2016 18:31:07 +0000 (18:31 +0000)]
Merge changes I03844bce,I8035357c,Ibe7cb6df into nyc-mr1-dev
* changes:
Remove lock contention when unlocking users
Only get trace name if tracing is enabled
Fix multi-window drag jank if vsync-app is before vsync-sf
TreeHugger Robot [Tue, 2 Aug 2016 18:29:45 +0000 (18:29 +0000)]
Merge "Use SurfaceControl.screenshot() instead of screencap for screenshots." into nyc-mr1-dev
Yigit Boyar [Tue, 2 Aug 2016 00:42:28 +0000 (17:42 -0700)]
Target API check for margin params fix
Prior to N, our widgets were not converting MarginLayoutParams
properly between ViewGroups. The fix intrudced some issues in
older apps as the broken conversion code would hide developer
errors. This CL guards the change with a target API check so
that we don't affect older apps.
Bug:
30378230
Change-Id: I215281d261b553c3b4cedcd29ea0a861df809471
Wei Liu [Tue, 2 Aug 2016 18:25:00 +0000 (18:25 +0000)]
Merge "Make NetworkOverLimitActivity and DataUsageSummaryActivity configurable" into cw-f-dev
Doris Liu [Tue, 2 Aug 2016 18:24:46 +0000 (18:24 +0000)]
Merge "Put VD animators on paused list when RT stops drawing" into nyc-mr1-dev am:
0cf4d47a40
am:
9fd7fccc22
Change-Id: I82c3370cc41777306d08fda2c69a84aaa3fb9237
Doris Liu [Tue, 2 Aug 2016 18:24:42 +0000 (18:24 +0000)]
Put VD animators on paused list when RT stops drawing am:
c82e879e56
am:
70b6080cd7
Change-Id: I2ad721d1e9a20e5a1946a779ac0e84118b017505
John Reck [Tue, 2 Aug 2016 18:24:38 +0000 (18:24 +0000)]
Merge "Fix FrameMetricsObserver crash" into nyc-mr1-dev am:
0d8f164cde
am:
744a887cb0
Change-Id: I4861e339831436761ee6f845aec1773f4ef65b76
John Reck [Tue, 2 Aug 2016 18:24:34 +0000 (18:24 +0000)]
Fix FrameMetricsObserver crash am:
65ddb154c7
am:
6e30f4c789
Change-Id: Ic1bc80f8bbd20ce73f9e32c3a7457ad876c28476
Doris Liu [Tue, 2 Aug 2016 18:15:46 +0000 (18:15 +0000)]
Merge "Put VD animators on paused list when RT stops drawing" into nyc-mr1-dev
am:
0cf4d47a40
Change-Id: I0bfeb90007505243f49985b9a1b62ad9276e4833
Doris Liu [Tue, 2 Aug 2016 18:15:44 +0000 (18:15 +0000)]
Put VD animators on paused list when RT stops drawing
am:
c82e879e56
Change-Id: I9f0202c8e69e681014253842b2a2de75d372616b
John Reck [Tue, 2 Aug 2016 18:15:41 +0000 (18:15 +0000)]
Merge "Fix FrameMetricsObserver crash" into nyc-mr1-dev
am:
0d8f164cde
Change-Id: If87fafcb7cc703fcd92c84fc966535948977083b
John Reck [Tue, 2 Aug 2016 18:15:39 +0000 (18:15 +0000)]
Fix FrameMetricsObserver crash
am:
65ddb154c7
Change-Id: I48a04e9ba2674da351d227ba7f6d6069fd3e4727
Makoto Onuki [Tue, 2 Aug 2016 18:15:24 +0000 (18:15 +0000)]
Merge "LauncherApps should also throw when user is locked" into nyc-mr1-dev am:
61dd3c557c
am:
1b75f9b9c5
Change-Id: Iee0d729b83e554e1ab7bbcf469bd3a2c98fbde37
Makoto Onuki [Tue, 2 Aug 2016 18:15:18 +0000 (18:15 +0000)]
LauncherApps should also throw when user is locked am:
02f338e23d
am:
897a4f84d0
Change-Id: I0e2112d5c638ddf11a51f004eec2b533acd2251b
Wei Liu [Thu, 21 Jul 2016 23:19:01 +0000 (16:19 -0700)]
Make NetworkOverLimitActivity and DataUsageSummaryActivity configurable
b/
23120366
Change-Id: I9176482ea15ee1fd0baa0958c582cb342dcd1b79
Doris Liu [Tue, 2 Aug 2016 18:08:04 +0000 (18:08 +0000)]
Merge "Put VD animators on paused list when RT stops drawing" into nyc-mr1-dev
TreeHugger Robot [Tue, 2 Aug 2016 18:06:07 +0000 (18:06 +0000)]
Merge "Fix FrameMetricsObserver crash" into nyc-mr1-dev
Makoto Onuki [Tue, 2 Aug 2016 18:03:09 +0000 (18:03 +0000)]
Merge "LauncherApps should also throw when user is locked" into nyc-mr1-dev
am:
61dd3c557c
Change-Id: I15b9720e1011f0e444a01f3ed9a49b2f7ee26f9f
Makoto Onuki [Tue, 2 Aug 2016 18:03:07 +0000 (18:03 +0000)]
LauncherApps should also throw when user is locked
am:
02f338e23d
Change-Id: I327fbde0973fc0e2942ca69cf98ccc0c04fd2417
Makoto Onuki [Tue, 2 Aug 2016 17:58:18 +0000 (17:58 +0000)]
Merge "LauncherApps should also throw when user is locked" into nyc-mr1-dev
Doris Ling [Wed, 20 Jul 2016 00:04:21 +0000 (17:04 -0700)]
Add metrics logging for fingerprint swipe for notification panel.
Add metrics log when fingerprint swipe to expand/collapse notification
panel is handled, and increment the notification and quick setting open
count correspondingly.
Bug:
29257528
Change-Id: Ic24c6463a4400711874602157e2fcadc7f0f6da6
Phil Weaver [Tue, 2 Aug 2016 17:15:23 +0000 (17:15 +0000)]
Merge "Reduce extra a11y events when alpha changes." into nyc-mr1-dev am:
41e185e73b
am:
2f91506f6f
Change-Id: Ib6e609a66cf1a9d92768da788c9a93bc4e246cc1
Phil Weaver [Tue, 2 Aug 2016 17:15:20 +0000 (17:15 +0000)]
Reduce extra a11y events when alpha changes. am:
9937f81ac6
am:
2dd6ce7aff
Change-Id: I70adc04b7890ce4a9b207c34d77461bcf22d413c
Phil Weaver [Tue, 2 Aug 2016 17:10:06 +0000 (17:10 +0000)]
Merge "Reduce extra a11y events when alpha changes." into nyc-mr1-dev
am:
41e185e73b
Change-Id: I3ae9d72d530d0af2b8802348b8b6ed881bd20288
Phil Weaver [Tue, 2 Aug 2016 17:10:03 +0000 (17:10 +0000)]
Reduce extra a11y events when alpha changes.
am:
9937f81ac6
Change-Id: I23a097e1de51449b7dfa4a4986255fec4c8c3b05
Dianne Hackborn [Tue, 2 Aug 2016 17:08:02 +0000 (17:08 +0000)]
Merge "Fix issue #
29506774: Foreground Service Can Avoid Notification Requirement" into nyc-mr1-dev am:
b008ff14ac
am:
eceb91e5f2
Change-Id: I8dc991e98cfcf73ca4a746750cd7d22cb7fde485
Dianne Hackborn [Tue, 2 Aug 2016 17:07:57 +0000 (17:07 +0000)]
Fix issue #
29506774: Foreground Service Can Avoid Notification Requirement am:
0ba4c710c6
am:
e1315924f1
Change-Id: I67d77792716287073352cb9f50a7f192f8f3fc90
Dianne Hackborn [Tue, 2 Aug 2016 17:01:07 +0000 (17:01 +0000)]
Merge "Fix issue #
29506774: Foreground Service Can Avoid Notification Requirement" into nyc-mr1-dev
am:
b008ff14ac
Change-Id: I23d4a012433e628c581d1ba0b8ae6d0b9cd6fbb5
Dianne Hackborn [Tue, 2 Aug 2016 17:01:04 +0000 (17:01 +0000)]
Fix issue #
29506774: Foreground Service Can Avoid Notification Requirement
am:
0ba4c710c6
Change-Id: Ic9afdc949c7783f5c849701a4fc7c4d6b01190c5
Phil Weaver [Tue, 2 Aug 2016 16:54:42 +0000 (16:54 +0000)]
Merge "Reduce extra a11y events when alpha changes." into nyc-mr1-dev
Dianne Hackborn [Tue, 2 Aug 2016 16:47:42 +0000 (16:47 +0000)]
Merge "Fix issue #
29506774: Foreground Service Can Avoid Notification Requirement" into nyc-mr1-dev
John Reck [Tue, 2 Aug 2016 16:38:26 +0000 (09:38 -0700)]
Fix FrameMetricsObserver crash
Bug:
30587465
Someday maybe the technology will exist to
allow sharing a simple constant between
Java and C++, but today is not that day.
Change-Id: I17694746cb8712058133cd5ea10c47b9909f740b
Bill Yi [Tue, 2 Aug 2016 10:11:43 +0000 (10:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
c1b853ebfb -s ours
am:
a42e6f0b21 -s ours
Change-Id: Ib27addd050a209fe86988fa5a0e6c76a6a7792cf
Bill Yi [Tue, 2 Aug 2016 10:11:39 +0000 (10:11 +0000)]
Import translations. DO NOT MERGE am:
f07d5b29a2 -s ours
am:
af4254f79f -s ours
Change-Id: I7593459fc9477ce57b206493cd8de2c466cbd9af
Bill Yi [Tue, 2 Aug 2016 10:11:35 +0000 (10:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
0b18f2c06f -s ours
am:
01f73cce2d -s ours
Change-Id: Ie0b66edfd08ddcaaad0bec6c88a9c08d87c87c5b
Bill Yi [Tue, 2 Aug 2016 10:11:31 +0000 (10:11 +0000)]
Import translations. DO NOT MERGE am:
f0f669876e -s ours
am:
506b68bbad -s ours
Change-Id: I1696d73662d39b5c58f199884b9862b761e210a2
Bill Yi [Tue, 2 Aug 2016 10:05:31 +0000 (10:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
c1b853ebfb -s ours
Change-Id: I40b296ff7928f4fed612f98b0421550a3da42ef6
Bill Yi [Tue, 2 Aug 2016 10:05:30 +0000 (10:05 +0000)]
Import translations. DO NOT MERGE
am:
f07d5b29a2 -s ours
Change-Id: Idd19caa3fa488ec9a5db1bf45556c7b3b50d9ab7
Bill Yi [Tue, 2 Aug 2016 10:05:27 +0000 (10:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
0b18f2c06f -s ours
Change-Id: Iaca200f529c8d0bcd6eacd81604c4c5c470061f8
Bill Yi [Tue, 2 Aug 2016 10:05:25 +0000 (10:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
618d5b354b -s ours
am:
b6cf3d2d64 -s ours
Change-Id: I44cca2dba893b8be5bbbe52fb58483cfce6d53a2
Bill Yi [Tue, 2 Aug 2016 10:05:25 +0000 (10:05 +0000)]
Import translations. DO NOT MERGE
am:
f0f669876e -s ours
Change-Id: Ic90e8cd489ebdba8bf773b848b66ccd1f4f68641
Bill Yi [Tue, 2 Aug 2016 10:05:21 +0000 (10:05 +0000)]
Import translations. DO NOT MERGE am:
c0f585cedd -s ours
am:
88a94b9009 -s ours
Change-Id: If9055eb0f7e86a82289b1a26545e5307ade7969c
Bill Yi [Tue, 2 Aug 2016 09:58:02 +0000 (09:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
618d5b354b -s ours
Change-Id: Iee8e6240b79e425ddd25f6922fcc43a455761c73
Bill Yi [Tue, 2 Aug 2016 09:58:01 +0000 (09:58 +0000)]
Import translations. DO NOT MERGE
am:
c0f585cedd -s ours
Change-Id: Ie416c5ae84209d040cf587cc72d4a8c17b7b8d74
Jorim Jaggi [Mon, 1 Aug 2016 12:31:02 +0000 (14:31 +0200)]
Remove lock contention when unlocking users
Bug:
30213213
Change-Id: I03844bce11326bf58788bf0fe71c247c9f2665c4
TreeHugger Robot [Tue, 2 Aug 2016 09:50:07 +0000 (09:50 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 2 Aug 2016 09:49:50 +0000 (09:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 2 Aug 2016 09:49:19 +0000 (09:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Jorim Jaggi [Mon, 1 Aug 2016 11:31:55 +0000 (13:31 +0200)]
Only get trace name if tracing is enabled
String formatting creates new objects, so only do it if needed.
Bug:
30549756
Change-Id: I8035357c2b9c3066ef7663b938654f698a2321bc
Jorim Jaggi [Tue, 2 Aug 2016 09:01:12 +0000 (09:01 +0000)]
Reduce duration for pick-up animation am:
ceb7bfa6af
am:
838776a93b
Change-Id: I95328cfc689e400d1f8bb04ec1674e867ac603fb