OSDN Git Service
Siyamed Sinir [Fri, 27 May 2016 19:04:30 +0000 (19:04 +0000)]
Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev am:
990e26118d
am:
4dc77b7a5e
* commit '
4dc77b7a5ecd5d957175b85978471debdf45e028':
Change-Id: I63ca616b1a34b6973d1b97eca9004319fb43058f
Siyamed Sinir [Fri, 27 May 2016 19:00:11 +0000 (19:00 +0000)]
Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev am:
990e26118d
am:
6fe1ab7f21
* commit '
6fe1ab7f21a7b8d1b88334020a6f11aea6b7a771':
Revert "Fix TextView layout reuse when maxLines is set"
Change-Id: I9141cc021ed511988f8fd4d9f6b4ea7d04aca270
Android Build Merger (Role) [Fri, 27 May 2016 18:57:15 +0000 (18:57 +0000)]
Merge "Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am:
92d0316d28 am:
3f23dad913" into nyc-mr1-dev-plus-aosp
Siyamed Sinir [Fri, 27 May 2016 18:56:00 +0000 (18:56 +0000)]
Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am:
92d0316d28
am:
3f23dad913
* commit '
3f23dad913859d725ad1b63b12ee0e800a47beb7':
Set StaticLayout.maxLines only when ellipsize is set
Change-Id: I29c05c5359cbc5f969b0c89860a431b0f1342151
Siyamed Sinir [Fri, 27 May 2016 18:55:30 +0000 (18:55 +0000)]
Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am:
92d0316d28
am:
361f03c4e2
* commit '
361f03c4e2c774c074ef98ab2631e28288690034':
Set StaticLayout.maxLines only when ellipsize is set
Change-Id: I15d616a7b448dc8e63c1a7d0ac136be98669a869
Siyamed Sinir [Fri, 27 May 2016 18:50:51 +0000 (18:50 +0000)]
Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev
am:
990e26118d
* commit '
990e26118d5b6cad2d34483b1908ba6f8334a764':
Revert "Fix TextView layout reuse when maxLines is set"
Change-Id: I543c1944fafb920b697eb87c92cf0d4ae8339e54
Siyamed Sinir [Fri, 27 May 2016 18:50:50 +0000 (18:50 +0000)]
Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev
am:
990e26118d
* commit '
990e26118d5b6cad2d34483b1908ba6f8334a764':
Revert "Fix TextView layout reuse when maxLines is set"
Change-Id: Ia2c2d22b40c4613c54c9d86a29f21059da3f7a42
Siyamed Sinir [Fri, 27 May 2016 18:45:20 +0000 (18:45 +0000)]
Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev
am:
92d0316d28
* commit '
92d0316d2837baceffb22e1a7eb0e5da50f0a025':
Set StaticLayout.maxLines only when ellipsize is set
Change-Id: I2b0281da1d8aba5f84da01c00f31d79af901db35
Siyamed Sinir [Fri, 27 May 2016 18:45:17 +0000 (18:45 +0000)]
Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev
am:
92d0316d28
* commit '
92d0316d2837baceffb22e1a7eb0e5da50f0a025':
Set StaticLayout.maxLines only when ellipsize is set
Change-Id: I17934afae1d5e8b7fe3b3ad8b4286dd43f68393e
Siyamed Sinir [Fri, 27 May 2016 18:34:27 +0000 (18:34 +0000)]
Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev
Siyamed Sinir [Fri, 27 May 2016 18:34:27 +0000 (18:34 +0000)]
Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev
Chih-Hung Hsieh [Fri, 27 May 2016 18:24:24 +0000 (18:24 +0000)]
Merge "Fix misc-macro-parentheses warnings in DngCreator." am:
d439efc361 am:
cfae35a400
am:
86f5b560af
* commit '
86f5b560af60d91ed67642bfb7392ba6a7cd45b4':
Fix misc-macro-parentheses warnings in DngCreator.
Change-Id: Id8b2d4ba5e721815dc612cbf349ceba8bbb32538
Android Build Merger (Role) [Fri, 27 May 2016 18:16:29 +0000 (18:16 +0000)]
Merge "Merge "Doc change: Fix broken link." into mnc-io-docs am:
d643ab1ddb am:
f9d8f6c5f3 am:
7f1330358a am:
1743e97f3a" into nyc-mr1-dev-plus-aosp
Chih-hung Hsieh [Fri, 27 May 2016 18:16:02 +0000 (18:16 +0000)]
Merge "Fix misc-macro-parentheses warnings in DngCreator." am:
d439efc361
am:
cfae35a400
* commit '
cfae35a4007316cdff280ecce3d71d8d6074bccc':
Fix misc-macro-parentheses warnings in DngCreator.
Change-Id: I0e6297b1e2182d4209bf6744e9d35e574883d7da
Mark Goldstein [Fri, 27 May 2016 18:15:50 +0000 (18:15 +0000)]
Merge "Doc change: Fix broken link." into mnc-io-docs am:
d643ab1ddb am:
f9d8f6c5f3 am:
7f1330358a
am:
1743e97f3a
* commit '
1743e97f3a1ec9c40b3c799ca34cf01186e38f35':
Doc change: Fix broken link.
Change-Id: Ic1a1c08af0e222948d0ebe3d0a92601af0a33238
Mark Goldstein [Fri, 27 May 2016 18:15:20 +0000 (18:15 +0000)]
Merge "Doc change: Fix broken link." into mnc-io-docs am:
d643ab1ddb am:
f9d8f6c5f3 am:
7f1330358a
am:
90045710ca
* commit '
90045710ca4d1bdad279c40084ad60341f13847d':
Doc change: Fix broken link.
Change-Id: I8c007a139b0ceb24abd2996649e222fee402ed12
Mark Goldstein [Fri, 27 May 2016 18:09:54 +0000 (18:09 +0000)]
Merge "Doc change: Fix broken link." into mnc-io-docs am:
d643ab1ddb am:
f9d8f6c5f3
am:
7f1330358a
* commit '
7f1330358ac8037e440f0a66f9abed0f5db0481f':
Doc change: Fix broken link.
Change-Id: I539b08283eee0c0d00fb5c04a97fd01c02780dd4
Chih-Hung Hsieh [Fri, 27 May 2016 18:09:49 +0000 (18:09 +0000)]
Merge "Fix misc-macro-parentheses warnings in DngCreator."
am:
d439efc361
* commit '
d439efc361535701f6d2d0b82cfa22b9d4a5898b':
Fix misc-macro-parentheses warnings in DngCreator.
Change-Id: I5fd1127ff3efde3b44ac6d358d48665f89d54e01
Mark Goldstein [Fri, 27 May 2016 18:09:42 +0000 (18:09 +0000)]
Merge "Doc change: Fix broken link." into mnc-io-docs am:
d643ab1ddb am:
f9d8f6c5f3
am:
7f1330358a
* commit '
7f1330358ac8037e440f0a66f9abed0f5db0481f':
Doc change: Fix broken link.
Change-Id: I5234b90d962f485510c0395b116b9565c58cf7ab
Jae Seo [Fri, 27 May 2016 18:01:47 +0000 (18:01 +0000)]
Merge "PIP: Improve PIP control row\'s focus change animation in Recents" into nyc-dev am:
f8c504db7f
am:
cac5be859f
* commit '
cac5be859ff4cbe0888fa0f3bcc8a6b43ff60bf1':
Change-Id: I738e256fe9ef0c1a35c01efb0f90a85eae272b86
Jason Monk [Fri, 27 May 2016 18:01:41 +0000 (18:01 +0000)]
Merge "QS: Handle detail scroll properly" into nyc-dev am:
4f620d423f
am:
582ee3eb65
* commit '
582ee3eb65623a25cb97f0a25ad6494c9d871475':
Change-Id: I676420dc7c696e40b8db8524b2cdbf7cba9a2ba7
Chris Wren [Fri, 27 May 2016 18:01:34 +0000 (18:01 +0000)]
Merge "add metrics for gestural notification expansions" into nyc-dev am:
cd9ea74659
am:
14c87a5f3f
* commit '
14c87a5f3f01282e1c0d4403e1484143272423d2':
Change-Id: I45dac95fb5d184b7da87c72ade4478f396a99f09
Mark Goldstein [Fri, 27 May 2016 17:57:50 +0000 (17:57 +0000)]
Merge "Doc change: Fix broken link." into mnc-io-docs am:
d643ab1ddb
am:
f9d8f6c5f3
* commit '
f9d8f6c5f36b07961f2d38b43c991ed679022f7e':
Doc change: Fix broken link.
Change-Id: Iee76c1e357f2c67362d951f567bc3498c208fb35
Jae Seo [Fri, 27 May 2016 17:57:36 +0000 (17:57 +0000)]
Merge "PIP: Improve PIP control row\'s focus change animation in Recents" into nyc-dev am:
f8c504db7f
am:
9e78ee80b8
* commit '
9e78ee80b8d82228c878b8208340038970ccf30c':
PIP: Improve PIP control row's focus change animation in Recents
Change-Id: I63ddb63df3e459222044c6ef50f7304f9adfa4a1
Jason Monk [Fri, 27 May 2016 17:57:29 +0000 (17:57 +0000)]
Merge "QS: Handle detail scroll properly" into nyc-dev am:
4f620d423f
am:
11aa8b009f
* commit '
11aa8b009f521ed73ec966aa671e946ed541be5c':
QS: Handle detail scroll properly
Change-Id: I345bb825f15e92a1c2cf6892713b700627c81e2d
Chih-hung Hsieh [Fri, 27 May 2016 17:56:46 +0000 (17:56 +0000)]
Merge "Fix misc-macro-parentheses warnings in DngCreator."
Jaewan Kim [Fri, 27 May 2016 17:46:48 +0000 (17:46 +0000)]
Merge "PIP: Improve PIP control row\'s focus change animation in Recents" into nyc-dev
am:
f8c504db7f
* commit '
f8c504db7f2e0e35c5fa19cad46681dc17db7488':
PIP: Improve PIP control row's focus change animation in Recents
Change-Id: I55e62b5a1ba5290b4167c895707cf360b97b042a
Amith Yamasani [Fri, 27 May 2016 17:46:48 +0000 (17:46 +0000)]
Merge "Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""" into nyc-mr1-dev
am:
aabbfc5565
* commit '
aabbfc5565a6fee8b1fbdaa26f050ee6617b3370':
Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""
Change-Id: Iaf1a47b3c5091771902b0a3630d83067d3b75440
Mark Goldstein [Fri, 27 May 2016 17:46:38 +0000 (17:46 +0000)]
Merge "Doc change: Fix broken link." into mnc-io-docs
am:
d643ab1ddb
* commit '
d643ab1ddb737aeb6636c61839cb64bdc7348c04':
Doc change: Fix broken link.
Change-Id: Ia1a9fdd18486ecf34d4a577f0e7f9d9570f748a3
Jason Monk [Fri, 27 May 2016 17:46:38 +0000 (17:46 +0000)]
Merge "QS: Handle detail scroll properly" into nyc-dev
am:
4f620d423f
* commit '
4f620d423f82dd43ed79178e0091132dd49ca2a9':
QS: Handle detail scroll properly
Change-Id: I6c3023fc9a6053b5918a22fff9f9af577df48c43
Chris Wren [Fri, 27 May 2016 17:46:38 +0000 (17:46 +0000)]
resolve merge conflicts of
cd9ea74 to nyc-mr1-dev
am:
7ee8418076
* commit '
7ee841807641c1784a15a0122afd5b068261f21f':
add metrics for gestural notification expansions
Change-Id: I763151a2987e6d318f5407c6c7b4e8733e5084c5
Mark Goldstein [Fri, 27 May 2016 17:37:36 +0000 (17:37 +0000)]
Merge "Doc change: Fix broken link." into mnc-io-docs
TreeHugger Robot [Fri, 27 May 2016 17:36:42 +0000 (17:36 +0000)]
Merge "Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""" into nyc-mr1-dev
Makoto Onuki [Fri, 27 May 2016 17:34:04 +0000 (17:34 +0000)]
Merge "ShortcutManager: Support manifest shortcuts" into nyc-mr1-dev
am:
05e0a9f3cf
* commit '
05e0a9f3cf632e237654c13f6d223eb22ea3be89':
ShortcutManager: Support manifest shortcuts
Change-Id: Ib0a2620e92249452130a681208424fbddfa1935b
Chris Wren [Fri, 27 May 2016 17:34:02 +0000 (13:34 -0400)]
resolve merge conflicts of
cd9ea74 to nyc-mr1-dev
Change-Id: I37bc8256b8b91274f418cbefe2797f068cd98dd4
Jaewan Kim [Fri, 27 May 2016 17:33:48 +0000 (17:33 +0000)]
Merge "PIP: Improve PIP control row\'s focus change animation in Recents" into nyc-dev
am:
f8c504db7f
* commit '
f8c504db7f2e0e35c5fa19cad46681dc17db7488':
PIP: Improve PIP control row's focus change animation in Recents
Change-Id: Ic1633d3a1f03fbb000a70743b13a8b4483c3279a
Jae Seo [Fri, 27 May 2016 17:23:57 +0000 (17:23 +0000)]
Merge "PIP: Improve PIP control row's focus change animation in Recents" into nyc-dev
Makoto Onuki [Fri, 27 May 2016 17:21:51 +0000 (17:21 +0000)]
Merge "ShortcutManager: Support manifest shortcuts" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 27 May 2016 17:07:44 +0000 (17:07 +0000)]
Merge "Merge "Announce upcoming tile state on click." into nyc-dev am:
293c967667 am:
4d55281b08" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Fri, 27 May 2016 17:07:10 +0000 (17:07 +0000)]
Merge "Announce upcoming tile state on click." into nyc-dev am:
293c967667
am:
4d55281b08
* commit '
4d55281b08011f8f75fea65710c8edfef17a5bed':
Announce upcoming tile state on click.
Change-Id: Ie968e8df6e3f6d422c7286b0a686d0e4a292c143
Julia Reynolds [Fri, 27 May 2016 17:05:23 +0000 (17:05 +0000)]
Merge "Announce upcoming tile state on click." into nyc-dev am:
293c967667
am:
0a5b17a1dc
* commit '
0a5b17a1dc70986009bdb3820a532a3394d9330e':
Announce upcoming tile state on click.
Change-Id: I1c195dfa715e9c1c615a23cc6f793a6db56bd4b9
Jason Monk [Fri, 27 May 2016 17:02:49 +0000 (17:02 +0000)]
Merge "QS: Handle detail scroll properly" into nyc-dev
am:
4f620d423f
* commit '
4f620d423f82dd43ed79178e0091132dd49ca2a9':
QS: Handle detail scroll properly
Change-Id: I4614a2999aba2f5bc836f7fab21912fb75be1f65
Julia Reynolds [Fri, 27 May 2016 16:59:32 +0000 (16:59 +0000)]
Merge "Announce upcoming tile state on click." into nyc-dev
am:
293c967667
* commit '
293c96766727517b5a94008a43d308a6d990faea':
Announce upcoming tile state on click.
Change-Id: Ied45168428e0b1945ce6613ff0be40666c1f97dc
Chris Wren [Fri, 27 May 2016 16:57:49 +0000 (16:57 +0000)]
Merge "add metrics for gestural notification expansions" into nyc-dev
am:
cd9ea74659
* commit '
cd9ea74659be1f831eb160dd14648de046c75073':
add metrics for gestural notification expansions
Change-Id: I7594a6cbe91fe4a0c51193d24cc6e72f58d4fb02
Julia Reynolds [Fri, 27 May 2016 16:57:40 +0000 (16:57 +0000)]
Merge "Announce upcoming tile state on click." into nyc-dev
am:
293c967667
* commit '
293c96766727517b5a94008a43d308a6d990faea':
Announce upcoming tile state on click.
Change-Id: I41a5cb30a677bc80dd50a8ae2dc7560019fd16ce
Jason Monk [Fri, 27 May 2016 16:51:47 +0000 (16:51 +0000)]
Merge "QS: Handle detail scroll properly" into nyc-dev
TreeHugger Robot [Fri, 27 May 2016 16:49:56 +0000 (16:49 +0000)]
Merge "add metrics for gestural notification expansions" into nyc-dev
Julia Reynolds [Fri, 27 May 2016 16:48:24 +0000 (16:48 +0000)]
Merge "Announce upcoming tile state on click." into nyc-dev
Makoto Onuki [Tue, 17 May 2016 21:52:19 +0000 (14:52 -0700)]
ShortcutManager: Support manifest shortcuts
- Now apps can publish shortcuts via AndroidManifest.xml
(Sample: I5b127150)
- Rename some APIs per API council feedback
- Publishers can now "disable" shortcuts.
(https://docs.google.com/presentation/d/1raUn1QBURDb1yrd6mSmVxII9ezNh3MWukODdtufJ29U/edit#slide=id.g13ef592464_7_39)
Bug
28785283
Bug
28536066
Change-Id: I4a126841e43e40139bb4baa6d0f98ad7b3a75ac1
Android Build Merger (Role) [Fri, 27 May 2016 16:33:57 +0000 (16:33 +0000)]
Merge "Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev am:
7730e57dc6 am:
cea28a3935" into nyc-mr1-dev-plus-aosp
Ruchi Kandoi [Fri, 27 May 2016 16:33:12 +0000 (16:33 +0000)]
Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev am:
7730e57dc6
am:
cea28a3935
* commit '
cea28a39359c2eed9c8875780d6c117afa265ffa':
PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()
Change-Id: I7985d452fb586b8d8bc1bf75835bb6c47aa8caa4
Ruchi Kandoi [Fri, 27 May 2016 16:32:29 +0000 (16:32 +0000)]
Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev am:
7730e57dc6
am:
e9f42318f6
* commit '
e9f42318f61889133ad7fdcbe28bbd58f0c6739e':
PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()
Change-Id: I89f6847cba38d9e2f833892c7a849c49261e8814
Ruchi Kandoi [Fri, 27 May 2016 16:28:03 +0000 (16:28 +0000)]
Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev
am:
7730e57dc6
* commit '
7730e57dc6624a66cdc35260f855a467fadc7b04':
PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()
Change-Id: If4934466722851e9c7ca1443cae3e31f2b25c6c7
Ruchi Kandoi [Fri, 27 May 2016 16:28:03 +0000 (16:28 +0000)]
Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev
am:
7730e57dc6
* commit '
7730e57dc6624a66cdc35260f855a467fadc7b04':
PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()
Change-Id: I49a0d514677a513aa85c98031a1a111657c6398b
Amith Yamasani [Fri, 27 May 2016 15:57:38 +0000 (15:57 +0000)]
Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""
Added the missing import.
This reverts commit
c51e725644be6d46e25c29e8774b542d52c29400.
Change-Id: Icd63619a12e10dee628e568a6200d429a9936cf0
Ruchi Kandoi [Fri, 27 May 2016 16:20:42 +0000 (16:20 +0000)]
Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev
Alan Viverette [Fri, 27 May 2016 15:15:10 +0000 (15:15 +0000)]
Merge "resolve merge conflicts of
f118700 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
am:
9ab249bef2
* commit '
9ab249bef26c82fe7e15e0f7d036fa63c41074d7':
Chronometer: Update the value only if displayed on screen
Change-Id: I53a3fbca00fe44b6d2d6f055280175e01e2b827b
Alan Viverette [Fri, 27 May 2016 15:09:17 +0000 (15:09 +0000)]
Merge "resolve merge conflicts of
f118700 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 15:08:40 +0000 (15:08 +0000)]
Merge "Merge "Don\'t drop IPv4 broadcast packets when WiFi multicast lock is held" into nyc-dev am:
83e50327fc am:
e8b8f1b48e" into nyc-mr1-dev-plus-aosp
Paul Jensen [Fri, 27 May 2016 15:08:07 +0000 (15:08 +0000)]
Merge "Don\'t drop IPv4 broadcast packets when WiFi multicast lock is held" into nyc-dev am:
83e50327fc
am:
e8b8f1b48e
* commit '
e8b8f1b48e1d28ef7f749f760251239a5c00be15':
Don't drop IPv4 broadcast packets when WiFi multicast lock is held
Change-Id: Ib4a1d0806728792635444998ddf5c24075309f0b
Paul Jensen [Fri, 27 May 2016 15:08:05 +0000 (15:08 +0000)]
Merge "Don\'t drop IPv4 broadcast packets when WiFi multicast lock is held" into nyc-dev am:
83e50327fc
am:
ae8f345d15
* commit '
ae8f345d155a9aa29bce107c6675e2da8ed61a8b':
Don't drop IPv4 broadcast packets when WiFi multicast lock is held
Change-Id: I5b544fe6e52a41d508932c2747294b20862d7ffe
Alan Viverette [Fri, 27 May 2016 15:04:59 +0000 (11:04 -0400)]
resolve merge conflicts of
f118700 to nyc-dev-plus-aosp
Change-Id: I6fc2b3d279318c5c34a1f4b2921d3c1eff8ac627
Paul Jensen [Fri, 27 May 2016 15:03:53 +0000 (15:03 +0000)]
Merge "Don\'t drop IPv4 broadcast packets when WiFi multicast lock is held" into nyc-dev
am:
83e50327fc
* commit '
83e50327fcf24e4d17a341cc2efaafc95046a8f9':
Don't drop IPv4 broadcast packets when WiFi multicast lock is held
Change-Id: I1cae052945f3366c2d1669cd37118851239d0f07
Paul Jensen [Fri, 27 May 2016 15:03:48 +0000 (15:03 +0000)]
Merge "Don\'t drop IPv4 broadcast packets when WiFi multicast lock is held" into nyc-dev
am:
83e50327fc
* commit '
83e50327fcf24e4d17a341cc2efaafc95046a8f9':
Don't drop IPv4 broadcast packets when WiFi multicast lock is held
Change-Id: Ib76e96a84820fa36357d820ef6845f6155ec902c
Julia Reynolds [Fri, 27 May 2016 15:01:55 +0000 (11:01 -0400)]
Announce upcoming tile state on click.
Change-Id: Ib804b5db13bbee07c6d45e8aa077cac60e28efb2
Fixes:
28964765
TreeHugger Robot [Fri, 27 May 2016 14:58:47 +0000 (14:58 +0000)]
Merge "Don't drop IPv4 broadcast packets when WiFi multicast lock is held" into nyc-dev
Jason Monk [Fri, 27 May 2016 14:47:51 +0000 (10:47 -0400)]
QS: Handle detail scroll properly
Add custom scrollview that ensures the touches can cause a scroll.
Change-Id: Ib18ac24ded11d06f59f582248964bd697652c192
Fixes:
28671167
Simon Dubray [Fri, 27 May 2016 14:26:23 +0000 (14:26 +0000)]
Merge "Chronometer: Update the value only if displayed on screen"
am:
34cd48bcd8
* commit '
34cd48bcd8d284d864a0876db1373099c51b98e2':
Chronometer: Update the value only if displayed on screen
Change-Id: I01a820daaa6308c1cc00cd19940db12ec827f424
Alan Viverette [Fri, 27 May 2016 14:18:20 +0000 (14:18 +0000)]
Merge "Chronometer: Update the value only if displayed on screen"
Ivan Podogov [Fri, 27 May 2016 14:11:41 +0000 (14:11 +0000)]
Merge "Set the sensor batch size for accelerometer listener." into nyc-mr1-dev
am:
22132cb6be
* commit '
22132cb6be1735873f595372330fed8e369b5d8d':
Set the sensor batch size for accelerometer listener.
Change-Id: I585993d1bf21b31705f8c5825f4f4bd2a804ccc2
Ivan Podogov [Fri, 27 May 2016 14:04:44 +0000 (14:04 +0000)]
Merge "Set the sensor batch size for accelerometer listener." into nyc-mr1-dev
Paul Jensen [Thu, 26 May 2016 13:16:11 +0000 (09:16 -0400)]
Don't drop IPv4 broadcast packets when WiFi multicast lock is held
IPv4 broadcast packets can be very common (e.g. every 2s) so they
need to be dropped in the general case. They also may be critical
for certain discovery protocols, so allow them through with APF
when the WiFi multicast lock is held.
Bug:
26238573
Change-Id: I03e09a2b9c779da5da775e78b95e9e0339720eaf
Ivan Podogov [Fri, 27 May 2016 12:47:20 +0000 (13:47 +0100)]
Set the sensor batch size for accelerometer listener.
For the Wear devices it is important to set the batch size here,
because otherwise all sensor-related services (like gesture detection
or gaze/ungaze detection start to consume ~10x CPU time).
Bug:
28995481
Change-Id: I30f9e5f7ea5aee8fdd80734588386e64b874e1dc
Android Build Merger (Role) [Fri, 27 May 2016 10:04:26 +0000 (10:04 +0000)]
Merge "Merge "Restore DHCP client logging." into nyc-dev am:
0f8529236e am:
a0049256ed" into nyc-mr1-dev-plus-aosp
Lorenzo Colitti [Fri, 27 May 2016 10:03:57 +0000 (10:03 +0000)]
Merge "Restore DHCP client logging." into nyc-dev am:
0f8529236e
am:
4664b09778
* commit '
4664b097784512c9a30c5820558294e002b6328d':
Restore DHCP client logging.
Change-Id: I8a950df5193efbe849a53c44ca0e2842f5682a64
Lorenzo Colitti [Fri, 27 May 2016 10:03:57 +0000 (10:03 +0000)]
Merge "Restore DHCP client logging." into nyc-dev am:
0f8529236e
am:
a0049256ed
* commit '
a0049256edac628552cf132a42ff1657e73f4cf4':
Restore DHCP client logging.
Change-Id: I4ce9642bd55ba6a7daa6fb2bc368b50fdf03530b
Lorenzo Colitti [Fri, 27 May 2016 10:00:01 +0000 (10:00 +0000)]
Merge "Restore DHCP client logging." into nyc-dev
am:
0f8529236e
* commit '
0f8529236eaafdda20c730214b05fe8580a380fa':
Restore DHCP client logging.
Change-Id: I6259d9da4b971b4be38c61003f80a5c1c82ef46d
Lorenzo Colitti [Fri, 27 May 2016 10:00:00 +0000 (10:00 +0000)]
Merge "Restore DHCP client logging." into nyc-dev
am:
0f8529236e
* commit '
0f8529236eaafdda20c730214b05fe8580a380fa':
Restore DHCP client logging.
Change-Id: Ib7dd947192f749f8d5e9fc6e1b366a11a83caefa
TreeHugger Robot [Fri, 27 May 2016 09:53:48 +0000 (09:53 +0000)]
Merge "Restore DHCP client logging." into nyc-dev
Jaewan Kim [Mon, 16 May 2016 13:06:46 +0000 (22:06 +0900)]
PIP: Improve PIP control row's focus change animation in Recents
This includes following changes for performance
1. Passes the key events directly between the windows instead of using
dummy Views and OnFocusChangeListener to prevent main thread from
handling unnecessary focus changes.
2. Limits the window size for PIP controls to reduce unnecessary draw.
Here's the test result. Test is performed with paused PIP video
1. 5 visible recents task
Focus down: 48.14 fps -> 85.396 fps (+77.39%)
Focus up: 24.67 fps -> 45.33 fps (+83.77%)
2. 3 visible recents task
Focus down: 51.98 fps -> 132.72 fps (+155.34%)
Focus up: 30.91 fps -> 53.38 fps (+72.69%)
Bug:
28042495
Change-Id: I363232176975b160e122748c9997ef4b46b73a28
Lorenzo Colitti [Fri, 27 May 2016 04:59:57 +0000 (13:59 +0900)]
Restore DHCP client logging.
Bug:
28955598
Change-Id: I2e2684a787061612471830e4d840ce422091bafb
Sreevani Sreejith [Fri, 27 May 2016 04:29:51 +0000 (04:29 +0000)]
Merge "Added android:tools specification on navigation and actions page." into mnc-io-docs am:
4ca0c8052c am:
fe33c063a9 am:
4b058ae5b7
am:
64b29d4f8c
* commit '
64b29d4f8cab9303c05373f77d0d3017e583c4a6':
Change-Id: I528b9065181c4c91521d292e1569bb78a9a61b77
Winson [Fri, 27 May 2016 04:29:46 +0000 (04:29 +0000)]
Merge "Prevent setting the launch task id when docking." into nyc-dev am:
386a947616
am:
fb8ff0fd31
* commit '
fb8ff0fd31dda76ad650b218b8d00a1c3f4b095c':
Change-Id: Iccbe65526c7dd7a313926846fffebd176d982e64
Wale Ogunwale [Fri, 27 May 2016 04:29:39 +0000 (04:29 +0000)]
Merge "Only make Recents activity invisible if not focused on TV devices." into nyc-dev am:
20237bc68f
am:
f41776b211
* commit '
f41776b211ce9d3bcb7902cb29ffd0cbacab685d':
Change-Id: I168fb0ce505abd913a762a1852e4fdfaaa3237eb
Bart Sears [Fri, 27 May 2016 04:25:25 +0000 (04:25 +0000)]
Revert "Remove ActivityManager calls with PM.mInstallLock held"
am:
c51e725644
* commit '
c51e725644be6d46e25c29e8774b542d52c29400':
Revert "Remove ActivityManager calls with PM.mInstallLock held"
Change-Id: I1feafc8a4fbda585815624d4069973530b6864d4
Bart Sears [Fri, 27 May 2016 04:12:51 +0000 (04:12 +0000)]
Revert "Remove ActivityManager calls with PM.mInstallLock held"
This reverts commit
ac06a4907bff7d5ee0612dbb85180222e1455791.
Change-Id: I27bedbd221a8d416b9040a96063e66a1ca69fe2e
Android Build Merger (Role) [Fri, 27 May 2016 04:08:18 +0000 (04:08 +0000)]
Merge "Merge "Added android:tools specification on navigation and actions page." into mnc-io-docs am:
4ca0c8052c am:
fe33c063a9 am:
4b058ae5b7 am:
75fea11133" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 04:08:10 +0000 (04:08 +0000)]
Merge "Merge "Prevent setting the launch task id when docking." into nyc-dev am:
386a947616 am:
2e494ecc21" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 04:08:03 +0000 (04:08 +0000)]
Merge "Merge "Only make Recents activity invisible if not focused on TV devices." into nyc-dev am:
20237bc68f am:
b3c7e1c4f2" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 04:07:47 +0000 (04:07 +0000)]
Merge "Merge "Fix issue where max idle time > total idle time" into nyc-dev am:
89046edb4d am:
7e762beb7f" into nyc-mr1-dev-plus-aosp
Sreevani Sreejith [Fri, 27 May 2016 04:07:29 +0000 (04:07 +0000)]
Merge "Added android:tools specification on navigation and actions page." into mnc-io-docs am:
4ca0c8052c am:
fe33c063a9 am:
4b058ae5b7
am:
75fea11133
* commit '
75fea11133d300d42891e57e260a5f33d28395f6':
Added android:tools specification on navigation and actions page.
Change-Id: Ic636a52c5a8eaa9f0e8be80f2128c8678ecb20de
Android Build Merger (Role) [Fri, 27 May 2016 04:07:27 +0000 (04:07 +0000)]
Merge "Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev am:
7fe83ab54e am:
63014c5f6c" into nyc-mr1-dev-plus-aosp
Winson [Fri, 27 May 2016 04:07:24 +0000 (04:07 +0000)]
Merge "Prevent setting the launch task id when docking." into nyc-dev am:
386a947616
am:
2e494ecc21
* commit '
2e494ecc219052fbb4f91b290a83c2ef37a0dacf':
Prevent setting the launch task id when docking.
Change-Id: I712a0e88ce8b7007126d484b5faa57c0d047027f
Android Build Merger (Role) [Fri, 27 May 2016 04:07:18 +0000 (04:07 +0000)]
Merge "Merge "Ellipsize Preference summaries" into nyc-dev am:
0ca3829d4c am:
77efbbb3c5" into nyc-mr1-dev-plus-aosp
Wale Ogunwale [Fri, 27 May 2016 04:07:18 +0000 (04:07 +0000)]
Merge "Only make Recents activity invisible if not focused on TV devices." into nyc-dev am:
20237bc68f
am:
b3c7e1c4f2
* commit '
b3c7e1c4f2d700d5621219bde71a1fc095f15d1a':
Only make Recents activity invisible if not focused on TV devices.
Change-Id: Idcef0671de44ac2076df2532fcc9241a82df10d9
Android Build Merger (Role) [Fri, 27 May 2016 04:07:07 +0000 (04:07 +0000)]
Merge "Merge "Protect against NPE while to updating service connection activities." into nyc-dev am:
cef12198a7 am:
e3190c206c" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 27 May 2016 04:06:58 +0000 (04:06 +0000)]
Merge "Merge "Ensure surfaces only resize during relayout." into nyc-dev am:
58f1167ecf am:
197f9e1c7e" into nyc-mr1-dev-plus-aosp
Adam Lesinski [Fri, 27 May 2016 04:06:18 +0000 (04:06 +0000)]
Merge "Fix issue where max idle time > total idle time" into nyc-dev am:
89046edb4d
am:
7e762beb7f
* commit '
7e762beb7f7d91caece1737bc6712324a2544336':
Fix issue where max idle time > total idle time
Change-Id: I309cbaf9744f43057c44ab89f29835bd1d1b1717
Adrian Roos [Fri, 27 May 2016 04:06:15 +0000 (04:06 +0000)]
Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev am:
7fe83ab54e
am:
63014c5f6c
* commit '
63014c5f6cf5db310449994bb01b8fcf81c55e87':
Fix spurious crashes in StatusBarIconView
Change-Id: I5baca4dfb9064eab68b0a2190804049a7d37aefa
Roozbeh Pournader [Fri, 27 May 2016 04:06:07 +0000 (04:06 +0000)]
Merge "Ellipsize Preference summaries" into nyc-dev am:
0ca3829d4c
am:
77efbbb3c5
* commit '
77efbbb3c593f8a8100ec29814ec88fd2d94489d':
Ellipsize Preference summaries
Change-Id: I4f4110a5f16c9e49f9571980861c7a67553cb2f0
OSDN Git Service
