OSDN Git Service
Lucas Dupin [Thu, 13 Jul 2017 17:19:05 +0000 (17:19 +0000)]
Merge "In-app gradient color based on systemui theme." into oc-dr1-dev am:
717dd58c52
am:
de3597c769
Change-Id: I929d33ba540d03cdd823f0cf9a1b22b365fd9f2f
Lucas Dupin [Thu, 13 Jul 2017 17:09:59 +0000 (17:09 +0000)]
Merge "In-app gradient color based on systemui theme." into oc-dr1-dev
am:
717dd58c52
Change-Id: I35c7baae2e373f4d8bea87d1afc175833de7f59e
Lucas Dupin [Thu, 13 Jul 2017 17:03:47 +0000 (17:03 +0000)]
Merge "In-app gradient color based on systemui theme." into oc-dr1-dev
Tenghui Zhu [Thu, 13 Jul 2017 16:46:35 +0000 (16:46 +0000)]
Merge "Update the annotation for getAnimation"
Selim Cinek [Thu, 13 Jul 2017 16:42:24 +0000 (16:42 +0000)]
Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev am:
ac77186d34
am:
d4a3ca8d76
Change-Id: I7853e861904dac6a251979dfe841107f9956772d
Selim Cinek [Thu, 13 Jul 2017 16:36:48 +0000 (16:36 +0000)]
Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev
am:
ac77186d34
Change-Id: Ia5c6852cce42eb3fe600086c3140266a141bca03
Selim Cinek [Thu, 13 Jul 2017 16:29:21 +0000 (16:29 +0000)]
Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev
Bill Yi [Thu, 13 Jul 2017 16:11:39 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
4c44a3059c -s ours
am:
ff5416e5dc -s ours
Change-Id: If46ff7739aae13d118f597f4838c65924ce083f4
Bill Yi [Thu, 13 Jul 2017 16:06:11 +0000 (16:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
4c44a3059c -s ours
Change-Id: I0474490ef308e2df768be086ad76e8aae671891d
TreeHugger Robot [Thu, 13 Jul 2017 16:01:10 +0000 (16:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Thu, 13 Jul 2017 15:44:05 +0000 (15:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
482b2c3b12 -s ours
am:
b7d1a1fdc7 -s ours
Change-Id: I9ad8713f26221dbd14be8b44741ba236c32223d7
Bill Yi [Thu, 13 Jul 2017 15:39:12 +0000 (15:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
482b2c3b12 -s ours
Change-Id: I943722c47109b65dee52ad67292b14ec53074a24
TreeHugger Robot [Thu, 13 Jul 2017 15:36:34 +0000 (15:36 +0000)]
Merge "IpManager: define InitialConfiguration"
TreeHugger Robot [Thu, 13 Jul 2017 15:31:41 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Selim Cinek [Thu, 13 Jul 2017 13:46:10 +0000 (15:46 +0200)]
Fixed a bug where an incoming call wasn't launching
When the lockscreen isn't showing, but aod is, an incomming
call would not launch its fullscreen intent but show up in
AOD1. In addition was the display completely messed up and
overlapping other parts of the AOD screen.
Test: receive call while in AOD but not locked
Change-Id: Icc3e989167e72289ddcd0a62064526db9004cdc2
Fixes:
62402251
Hugo Benichi [Fri, 23 Jun 2017 01:07:08 +0000 (10:07 +0900)]
IpManager: define InitialConfiguration
This patch adds a InitialConfiguration class to IpManager for specifying
IP information in IpManager ProvisioningConfiguration at IpManager
startup.
At the moment this InitialConfiguration is not used, but is validated in
startProvsiioning if ProvisioningConfiguration includes one. It will be
integrated into IpManager IP provisioning logic in follow-up patches.
This patch also includes an example of data driven unit tests using a
table of test case. The highlights of this methodology are:
1) easy extensibility for new test case,
2) rich and informative error messages,
Unfortunately Java support for inlined data structure literals is poor
and some companion static methods for data generation are required for
enabling this methodology.
Bug:
62988545
Test: added new test in FrameworksNetTests,
$ runtest frameworks-net
$ runtest frameworks-wifi
Change-Id: I060b02603af7d73a6407df89344bf0c000574af2
Adrian Roos [Thu, 13 Jul 2017 12:17:44 +0000 (12:17 +0000)]
Merge "AOD: Implement long press gesture to launch assist" into oc-dr1-dev am:
3fbd93056e
am:
6d626acdbf
Change-Id: Iabff9ca955aef414ad7e62e0c68e2774ff01c9b7
Adrian Roos [Thu, 13 Jul 2017 12:10:21 +0000 (12:10 +0000)]
Merge "AOD: Implement long press gesture to launch assist" into oc-dr1-dev
am:
3fbd93056e
Change-Id: I8bc8e01a97711fdd30ff59aeb72d38e8acaa7c75
Adrian Roos [Thu, 13 Jul 2017 12:01:52 +0000 (12:01 +0000)]
Merge "AOD: Implement long press gesture to launch assist" into oc-dr1-dev
Neil Fuller [Thu, 13 Jul 2017 11:20:35 +0000 (11:20 +0000)]
Merge "Re-enable use of isPrivilegedApp()" am:
bd51de1b20 am:
a5a493cc19 am:
3a6b550753
am:
154eca93e7
Change-Id: Ie8793108595b128a8ec898b4cada98c98a93fb1c
Neil Fuller [Thu, 13 Jul 2017 11:13:09 +0000 (11:13 +0000)]
Merge "Re-enable use of isPrivilegedApp()" am:
bd51de1b20 am:
a5a493cc19
am:
3a6b550753
Change-Id: I0e2e6fa93a4f15023f17efba275c236880863ccd
Neil Fuller [Thu, 13 Jul 2017 11:06:06 +0000 (11:06 +0000)]
Merge "Re-enable use of isPrivilegedApp()" am:
bd51de1b20
am:
a5a493cc19
Change-Id: I633d8e838d559056a331bc81bd5db5f644fa4489
Neil Fuller [Thu, 13 Jul 2017 10:59:41 +0000 (10:59 +0000)]
Merge "Re-enable use of isPrivilegedApp()"
am:
bd51de1b20
Change-Id: I3e41058a76b840dfcd1b5171b8c6688509f1fd7d
Pavel Grafov [Thu, 13 Jul 2017 10:55:11 +0000 (10:55 +0000)]
Merge "Add DPMS test as presubmit test."
Neil Fuller [Thu, 13 Jul 2017 10:50:23 +0000 (10:50 +0000)]
Merge "Re-enable use of isPrivilegedApp()"
Bill Yi [Thu, 13 Jul 2017 10:10:00 +0000 (03:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id63562e9b590d6351469c5d884ebb9e5a24ba195
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Erik Kline [Thu, 13 Jul 2017 09:17:33 +0000 (09:17 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" am:
de837a97aa am:
ae21b89414 am:
17a62281e4 -s ours
am:
00c73c7784 -s ours
Change-Id: Iee7147a3f2a0e968d2154b623f741c738e5a641d
Erik Kline [Thu, 13 Jul 2017 09:12:02 +0000 (09:12 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" am:
de837a97aa am:
ae21b89414
am:
17a62281e4 -s ours
Change-Id: I3242d187a794d9c3fe51f971e9b15edfe55e9ce6
Erik Kline [Thu, 13 Jul 2017 09:07:01 +0000 (09:07 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" am:
de837a97aa
am:
ae21b89414
Change-Id: If96a33f26fed64a84219868d28765b7581ad453d
Erik Kline [Thu, 13 Jul 2017 09:00:56 +0000 (09:00 +0000)]
Merge "Program offload-exempt local prefixes into the HAL"
am:
de837a97aa
Change-Id: I741b6e31fb3adc922f47df824188786ff35e3aa9
Treehugger Robot [Thu, 13 Jul 2017 08:53:05 +0000 (08:53 +0000)]
Merge "Program offload-exempt local prefixes into the HAL"
Robert Berry [Thu, 13 Jul 2017 08:43:02 +0000 (08:43 +0000)]
Merge "Improve logging when restore fails to load Package Manager."
Bill Yi [Thu, 13 Jul 2017 07:50:26 +0000 (00:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife7e581a0b00d66c174680ed4e40ba8ba7fed86b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Erik Kline [Tue, 4 Jul 2017 09:28:11 +0000 (18:28 +0900)]
Program offload-exempt local prefixes into the HAL
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- observed calls to the HAL setLocalPrefixes in tethering log
Bug:
29337859
Bug:
32163131
Merged-In: I3c3bd4ee83ffe86ddbe6a16fbbfa0756bf5064d4
Merged-In: Iaf80e584df458010741401fc1a19e7f6e21923c1
Merged-In: Ifaf23c6179ead9de6ccfcf41e0c203025153167b
(cherry picked from commit
32179ff81511e00aef31e8fda705be3df074ece6)
Change-Id: I65ea833ac6fe7a75ebe546cfa358c4cffdf2de05
Erik Kline [Thu, 13 Jul 2017 07:41:52 +0000 (07:41 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" into oc-dr1-dev am:
aa7b8b5322
am:
b3d2aaaf2f
Change-Id: I3c3bd4ee83ffe86ddbe6a16fbbfa0756bf5064d4
Erik Kline [Thu, 13 Jul 2017 07:36:50 +0000 (07:36 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" into oc-dr1-dev
am:
aa7b8b5322
Change-Id: Iaf80e584df458010741401fc1a19e7f6e21923c1
TreeHugger Robot [Thu, 13 Jul 2017 07:31:13 +0000 (07:31 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 06:35:00 +0000 (06:35 +0000)]
Merge "WebView: update docs for WebView#initSafeBrowsing"
TreeHugger Robot [Thu, 13 Jul 2017 05:43:46 +0000 (05:43 +0000)]
Merge "LowpanCommissioningSession: Add `static abstract` keywords"
Nate Fischer [Thu, 13 Jul 2017 05:17:39 +0000 (05:17 +0000)]
Merge "WebView: Fix SafeBrowsingResponse API"
Nate Fischer [Thu, 13 Jul 2017 05:16:53 +0000 (05:16 +0000)]
Merge "WebView: fix WebView#setSafeBrowsingWhiteList"
Erik Kline [Tue, 4 Jul 2017 09:28:11 +0000 (18:28 +0900)]
Program offload-exempt local prefixes into the HAL
Additionally:
- move mOffloadController into MasterTetherSM
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- observed calls to the HAL setLocalPrefixes in tethering log
Bug:
29337859
Bug:
32163131
Change-Id: Ifaf23c6179ead9de6ccfcf41e0c203025153167b
Sudheer Shanka [Thu, 13 Jul 2017 04:39:27 +0000 (04:39 +0000)]
Merge "Update user perf tests to report only mean."
TreeHugger Robot [Thu, 13 Jul 2017 04:30:52 +0000 (04:30 +0000)]
Merge "Do not clear scores during stopTracking."
Fyodor Kupolov [Thu, 13 Jul 2017 04:07:09 +0000 (04:07 +0000)]
Merge "Revert "Fix ContentObserver unregister issue"" am:
31419a4ad4 am:
8625194c19 am:
cd816c1853
am:
c2a76d16f0
Change-Id: I6916fbf80f86419a264b4645d29c9167777543e8
Fyodor Kupolov [Thu, 13 Jul 2017 04:02:11 +0000 (04:02 +0000)]
Merge "Revert "Fix ContentObserver unregister issue"" am:
31419a4ad4 am:
8625194c19
am:
cd816c1853
Change-Id: I278d9449ab47f9bdecac8ad1075daed7d718544a
Fyodor Kupolov [Thu, 13 Jul 2017 03:56:09 +0000 (03:56 +0000)]
Merge "Revert "Fix ContentObserver unregister issue"" am:
31419a4ad4
am:
8625194c19
Change-Id: I5025d99e35dd267ffc3a0c0393a24ebb87cc0546
Fyodor Kupolov [Thu, 13 Jul 2017 03:49:36 +0000 (03:49 +0000)]
Merge "Revert "Fix ContentObserver unregister issue""
am:
31419a4ad4
Change-Id: I455be72533c24ceb5ea352774ded30d0c0a2367f
Andrii Kulian [Thu, 13 Jul 2017 03:47:30 +0000 (03:47 +0000)]
Merge "Position app with short aspect ratio opposite of nav bar" into oc-dr1-dev am:
a40af83c32
am:
8d99ed44f2
Change-Id: I28cee4719647f5c1746e62fe8c73ebdc99be6c65
Andrii Kulian [Thu, 13 Jul 2017 03:41:34 +0000 (03:41 +0000)]
Merge "Position app with short aspect ratio opposite of nav bar" into oc-dr1-dev
am:
a40af83c32
Change-Id: I08967a79847a0d42a0a5c67d2bb178d2717eae33
Treehugger Robot [Thu, 13 Jul 2017 03:38:46 +0000 (03:38 +0000)]
Merge "Revert "Fix ContentObserver unregister issue""
Robert Quattlebaum [Thu, 13 Jul 2017 02:51:46 +0000 (19:51 -0700)]
LowpanCommissioningSession: Add `static abstract` keywords
These keywords were accidentally left off of the original declaration.
Bug: b/
63645461
Change-Id: I1cadcd68831377ee1d1059f645f7178b7e5c742e
Tests: Verified by being able to successfully compile
I46667d4ea337463a35a9dd31fb00f7e130553d53
TreeHugger Robot [Thu, 13 Jul 2017 03:36:25 +0000 (03:36 +0000)]
Merge "Clear mCurrentAccessory if accessory function is no longer enabled"
Andrii Kulian [Thu, 13 Jul 2017 03:34:52 +0000 (03:34 +0000)]
Merge "Position app with short aspect ratio opposite of nav bar" into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 02:31:59 +0000 (02:31 +0000)]
Merge "Do not apply maxAspectRatio to bounds when in VR mode." into oc-dr1-dev am:
a781d471e2
am:
ae56a90541
Change-Id: I88b6daeec2a6770ab31e0ab661448968597fcdf5
Bryce Lee [Thu, 13 Jul 2017 02:24:59 +0000 (02:24 +0000)]
Merge "Do not apply maxAspectRatio to bounds when in VR mode." into oc-dr1-dev
am:
a781d471e2
Change-Id: If9c5c4a01bd11d71ba2e755b8b823a9acd013333
Bryce Lee [Thu, 13 Jul 2017 02:24:53 +0000 (02:24 +0000)]
Merge "Do not gate updating allDrawn on all child WindowStates." into oc-dr1-dev am:
7968af4873
am:
5623446926
Change-Id: I011d8e543245d11d530b61746513bc2bb812e6ea
Bryce Lee [Thu, 13 Jul 2017 02:18:50 +0000 (02:18 +0000)]
Merge "Do not gate updating allDrawn on all child WindowStates." into oc-dr1-dev
am:
7968af4873
Change-Id: Iad8a30362e2680522dafe602864d893ceb13e811
Bryce Lee [Thu, 13 Jul 2017 02:15:49 +0000 (02:15 +0000)]
Merge "Do not apply maxAspectRatio to bounds when in VR mode." into oc-dr1-dev
Sundeep Ghuman [Mon, 26 Jun 2017 23:05:40 +0000 (16:05 -0700)]
Do not clear scores during stopTracking.
Bug: b/
63034725
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: Ic15c7f42ec9a3883e8ba34194d9a9410457e4399
Bryce Lee [Thu, 13 Jul 2017 02:12:29 +0000 (02:12 +0000)]
Merge "Do not gate updating allDrawn on all child WindowStates." into oc-dr1-dev
Bryce Lee [Thu, 6 Jul 2017 21:09:29 +0000 (14:09 -0700)]
Do not gate updating allDrawn on all child WindowStates.
A recent change prevents allDrawn in AppWindowToken from being
updated until all child WindowStates have been considered. However,
children that are not visible do not affect allDrawn and therefore
need to be excluded.
This changelist adds an additional check to make sure the child can
affect the allDrawn state before considering blocking on it. It also
adds additional logs to the WindowState dump to better understand
this scenario.
Change-Id: I76d0f75496ed3da6a16c4a1d7bf2e7dc5b8bbe1e
Bug:
63380251
Test: go/wm-smoke
Bryce Lee [Thu, 13 Jul 2017 01:57:26 +0000 (01:57 +0000)]
Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am:
3de5101c12
am:
dfee7bea20
Change-Id: I8980b0d29fde42a8caf402d09db8537fddb7ac60
Bryce Lee [Thu, 13 Jul 2017 01:52:55 +0000 (01:52 +0000)]
Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev
am:
3de5101c12
Change-Id: I16cb39a8734799649b78a811e8b97eb87eb0c55d
Nate Fischer [Thu, 13 Jul 2017 01:45:03 +0000 (18:45 -0700)]
WebView: update docs for WebView#initSafeBrowsing
This fixes the documentation to specify that an application Context will
be used instead of an Activity Context (since only application Context
is needed).
Bug:
62192626,
63616213
Test: N/A
Change-Id: Ia34d2172be8cca7cb0751286c6c2388ff34d3f4a
Fyodor Kupolov [Thu, 13 Jul 2017 01:44:36 +0000 (01:44 +0000)]
Revert "Fix ContentObserver unregister issue"
This reverts commit
2df4e144a913b705c50bde929c75744b251967d9.
It was causing failures in packages/apps/DocumentsUI tests
Bug:
63638102
Bug:
63154326
Change-Id: I51fb54f705f58f159f4fcc30bfed41ababcba950
Bryce Lee [Thu, 13 Jul 2017 01:44:17 +0000 (01:44 +0000)]
Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev
Sudheer Shanka [Thu, 13 Jul 2017 01:12:31 +0000 (18:12 -0700)]
Update user perf tests to report only mean.
Test: bit MultiUserPerfTests:android.multiuser.UserLifecycleTests
Change-Id: Ib70123217c54b469844ce65ec52b7e7ed5b5998d
Eino-Ville Talvala [Thu, 13 Jul 2017 00:58:51 +0000 (00:58 +0000)]
Merge "CameraServiceProxy: Cleanups and receive more information from CameraService" into oc-dr1-dev am:
6a29ad5ede
am:
a6ce4cee9f
Change-Id: Ie378e167b993a4ad717722337abb7df5ac1598c4
TreeHugger Robot [Thu, 13 Jul 2017 00:55:24 +0000 (00:55 +0000)]
Merge "Fix left aligned "Wi-Fi" category title in data usage page."
Eino-Ville Talvala [Thu, 13 Jul 2017 00:51:41 +0000 (00:51 +0000)]
Merge "CameraServiceProxy: Cleanups and receive more information from CameraService" into oc-dr1-dev
am:
6a29ad5ede
Change-Id: I4bae269fc8b923667738a0dbfd4b14b0c086ed1d
TreeHugger Robot [Thu, 13 Jul 2017 00:44:46 +0000 (00:44 +0000)]
Merge "CameraServiceProxy: Cleanups and receive more information from CameraService" into oc-dr1-dev
Nate Fischer [Thu, 13 Jul 2017 00:37:07 +0000 (17:37 -0700)]
WebView: fix WebView#setSafeBrowsingWhiteList
This corrects the WebView#setSafeBrowsingWhiteList method to accept a
List<String> instead of a String[], as per API council recommendation.
Bug:
63084528,
63615148
Test: N/A
Change-Id: I53f490c6ab9c10fffe6c89010d7509747ac8f95f
Nate Fischer [Thu, 13 Jul 2017 00:12:16 +0000 (17:12 -0700)]
WebView: Fix SafeBrowsingResponse API
The methods were previously package-private by mistake. This fixes them
to be public.
Bug:
63615582,
62723291
Test: N/A
Change-Id: Ie9095f861213a70fd655561f911385bdd06632b3
Yang Ren [Thu, 13 Jul 2017 00:03:51 +0000 (00:03 +0000)]
Merge "Change Media Route Button animation images"
TreeHugger Robot [Thu, 13 Jul 2017 00:03:21 +0000 (00:03 +0000)]
Merge "Use support lib preference style as base"
Hall Liu [Wed, 12 Jul 2017 23:57:21 +0000 (23:57 +0000)]
Merge "Implement getDownloadStatus and add permission" am:
2fa880d016 am:
d45a007222 am:
9888af1dfc
am:
81d9c6fe71
Change-Id: Ida7f8cfd440553658108688b84f866dddafa3166
TreeHugger Robot [Wed, 12 Jul 2017 23:51:03 +0000 (23:51 +0000)]
Merge "Add new metric for SMS Mirroring Setting."
Phil Weaver [Wed, 12 Jul 2017 23:48:12 +0000 (23:48 +0000)]
Hall Liu [Wed, 12 Jul 2017 23:44:51 +0000 (23:44 +0000)]
Merge "Implement getDownloadStatus and add permission" am:
2fa880d016 am:
d45a007222
am:
9888af1dfc
Change-Id: I98d30f379072302a5e76a8b157d8aecdd1616235
Phil Weaver [Wed, 12 Jul 2017 23:36:38 +0000 (23:36 +0000)]
Phil Weaver [Wed, 12 Jul 2017 23:34:40 +0000 (23:34 +0000)]
Hall Liu [Wed, 12 Jul 2017 23:33:23 +0000 (23:33 +0000)]
Merge "Implement getDownloadStatus and add permission" am:
2fa880d016
am:
d45a007222
Change-Id: I31e9dddaf3086f885f1a75c88583953da95c8191
Phil Weaver [Wed, 12 Jul 2017 23:30:03 +0000 (23:30 +0000)]
Phil Weaver [Wed, 12 Jul 2017 23:28:02 +0000 (23:28 +0000)]
Hall Liu [Wed, 12 Jul 2017 23:27:49 +0000 (23:27 +0000)]
Merge "Implement getDownloadStatus and add permission"
am:
2fa880d016
Change-Id: I1c8b9140d6fdc20347858f1296dbccfc60319959
Phil Weaver [Wed, 12 Jul 2017 23:22:01 +0000 (23:22 +0000)]
Hall Liu [Wed, 12 Jul 2017 23:18:37 +0000 (23:18 +0000)]
Merge "Implement getDownloadStatus and add permission"
Phil Weaver [Wed, 12 Jul 2017 23:15:37 +0000 (23:15 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35 am:
a6e0a6e31d am:
cba64fb461 am:
998ef870c5 am:
bb89a1e3fe am:
f645a57a5e am:
c3fc745a1c
am:
26e98edf31
Change-Id: I75d7844c2a000fab74cc82881f8ca4cc43f7acf3
Phil Weaver [Wed, 12 Jul 2017 23:10:07 +0000 (23:10 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35 am:
a6e0a6e31d am:
cba64fb461 am:
998ef870c5 am:
bb89a1e3fe am:
f645a57a5e
am:
c3fc745a1c
Change-Id: I534f11f2eb0f737a2640acf4482a4af27927f694
ztenghui [Tue, 11 Jul 2017 23:03:36 +0000 (16:03 -0700)]
Update the annotation for getAnimation
b/
63584307
Test: None
Change-Id: If0581ec3302956735bc4cc549a70c5a5ab9b4e2a
Phil Weaver [Wed, 12 Jul 2017 23:03:33 +0000 (23:03 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35 am:
a6e0a6e31d am:
cba64fb461 am:
998ef870c5 am:
bb89a1e3fe
am:
f645a57a5e
Change-Id: Ibff94cad13a97c9b4a696f5e6df0522e8ac89d50
Phil Weaver [Wed, 12 Jul 2017 22:57:43 +0000 (22:57 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35 am:
a6e0a6e31d am:
cba64fb461 am:
998ef870c5
am:
bb89a1e3fe
Change-Id: I9e53b0461cb3f28ddc023ba551c1cb4eb1007340
Siddharth Ray [Wed, 12 Jul 2017 22:52:26 +0000 (22:52 +0000)]
Merge "Average of top 4 CNO" into oc-dr1-dev am:
e7f5c6aa38
am:
7c7475fcf6
Change-Id: I759ba1d030aa78277af1294d9b32d41d349febba
Phil Weaver [Wed, 12 Jul 2017 22:51:18 +0000 (22:51 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35 am:
a6e0a6e31d am:
cba64fb461
am:
998ef870c5
Change-Id: Icaf066033ce67780052b30be3de891907129404e
Doris Ling [Wed, 12 Jul 2017 22:50:38 +0000 (15:50 -0700)]
Fix left aligned "Wi-Fi" category title in data usage page.
Set thee category title text view to align at the start position.
Bug:
63399239
Test: visual
Change-Id: Iff5fbc595ec16396043d64a1ceb0fa81e874ea48
Siddharth Ray [Wed, 12 Jul 2017 22:46:23 +0000 (22:46 +0000)]
Merge "Average of top 4 CNO" into oc-dr1-dev
am:
e7f5c6aa38
Change-Id: I0080002fb2110fe08d24551f204ff68fcd1d273d
Winson Chung [Wed, 12 Jul 2017 22:46:12 +0000 (22:46 +0000)]
Merge "Fixing some issues with the assistant stack" into oc-dr1-dev am:
fbb85140f8
am:
5d5d8b9afa
Change-Id: Ia70062c385ef3d7e49d7cb5bc555824072358ed9
Phil Weaver [Wed, 12 Jul 2017 22:41:32 +0000 (22:41 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35 am:
a6e0a6e31d
am:
cba64fb461
Change-Id: I9c4fc2279ffa79ee85dc8a46be21095918fa52ad
Winson Chung [Wed, 12 Jul 2017 22:41:22 +0000 (22:41 +0000)]
Merge "Fixing some issues with the assistant stack" into oc-dr1-dev
am:
fbb85140f8
Change-Id: Iaf515fe72bd89ce4cf903ebb6d1c631353482c95
OSDN Git Service
