OSDN Git Service
Bill Yi [Tue, 11 Jul 2017 04:05:50 +0000 (04:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
88e9aa19e2 -s ours
am:
91dcbe4bd9 -s ours
Change-Id: I9fb6e2699b3f737053741a2e26095241413dda76
Android Build Merger (Role) [Tue, 11 Jul 2017 04:01:11 +0000 (04:01 +0000)]
Merge "Import translations. DO NOT MERGE am:
48cf1d9768 -s ours am:
829d7186d5 -s ours am:
c928f9b87d -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 11 Jul 2017 03:59:40 +0000 (03:59 +0000)]
Import translations. DO NOT MERGE am:
48cf1d9768 -s ours am:
829d7186d5 -s ours
am:
e2a38c087f -s ours
Change-Id: I1a354721fbdb5b6f2011e1852006eb9edb8bb7d2
Bill Yi [Tue, 11 Jul 2017 03:59:39 +0000 (03:59 +0000)]
Import translations. DO NOT MERGE am:
48cf1d9768 -s ours am:
829d7186d5 -s ours
am:
c928f9b87d -s ours
Change-Id: Ie4abec8395e6de552cbfc70f228196defc49595f
Bill Yi [Tue, 11 Jul 2017 03:59:10 +0000 (03:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
88e9aa19e2 -s ours
Change-Id: Iac87034d218ebdefbe1879192148ad323388c87c
Bill Yi [Tue, 11 Jul 2017 03:52:59 +0000 (03:52 +0000)]
Import translations. DO NOT MERGE am:
48cf1d9768 -s ours
am:
829d7186d5 -s ours
Change-Id: I16754fc3b6c9df4b415d8c74ffe390787e932f8c
Bill Yi [Tue, 11 Jul 2017 03:52:20 +0000 (03:52 +0000)]
Import translations. DO NOT MERGE am:
48cf1d9768 -s ours
am:
829d7186d5 -s ours
Change-Id: Icf5cedc770c63dc8e5e41cb128d01135fe1596bf
TreeHugger Robot [Tue, 11 Jul 2017 03:50:19 +0000 (03:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Tue, 11 Jul 2017 03:43:57 +0000 (03:43 +0000)]
Import translations. DO NOT MERGE
am:
48cf1d9768 -s ours
Change-Id: If7328a10566daf60ac6da033923b1acbb307865f
Jeff Davidson [Tue, 11 Jul 2017 01:55:12 +0000 (01:55 +0000)]
Merge "Move eUICC permissions to com.android namespace." into oc-dr1-dev
am:
3fc57019bb
Change-Id: Ic29ac9c37bfd6c39fadd53ae57fb289a2f858d5e
TreeHugger Robot [Tue, 11 Jul 2017 01:48:08 +0000 (01:48 +0000)]
Merge "Move eUICC permissions to com.android namespace." into oc-dr1-dev
Paul McLean [Tue, 11 Jul 2017 00:51:18 +0000 (00:51 +0000)]
Merge "Catch exception in descriptor parser causes device connection to be skipped." into oc-dr1-dev
am:
22d4bf2283
Change-Id: I93f90134618fa282ccf7c8d0e2acedf37ee41446
TreeHugger Robot [Tue, 11 Jul 2017 00:46:11 +0000 (00:46 +0000)]
Merge "Catch exception in descriptor parser causes device connection to be skipped." into oc-dr1-dev
Bill Yi [Mon, 10 Jul 2017 21:56:13 +0000 (14:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6f7c93454c795da3db06572b1cddf9691ec4ff8e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Michal Karpinski [Mon, 10 Jul 2017 21:33:04 +0000 (21:33 +0000)]
Merge "Eliminate a race condition that could lead to calling PBT#finalizeBackup() twice" into oc-dr1-dev
am:
150fec445a
Change-Id: I703b8b4cbcf810615946e7ef5bd4c6690ded8674
TreeHugger Robot [Mon, 10 Jul 2017 21:21:54 +0000 (21:21 +0000)]
Merge "Eliminate a race condition that could lead to calling PBT#finalizeBackup() twice" into oc-dr1-dev
Bill Yi [Mon, 10 Jul 2017 21:17:29 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0d78e510a92213c8cd7bf2ba96e756418b79aba8
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Chen Xu [Mon, 10 Jul 2017 21:00:27 +0000 (21:00 +0000)]
Merge "fix cellular captive portal reevaluation url" into oc-dr1-dev
am:
037503dfa0
Change-Id: I008839786c3557f3dd418f8bb82f1cea0c27d3a1
Paul McLean [Mon, 10 Jul 2017 20:51:57 +0000 (14:51 -0600)]
Catch exception in descriptor parser causes device connection to be skipped.
Bug:
63538159
Test: Manual - force an exception and verify the the device is still available.
Change-Id: I4f4c59d4d0f73b664fac8bc74a64414d0e9d9a24
Chen Xu [Mon, 10 Jul 2017 20:51:52 +0000 (20:51 +0000)]
Merge "fix cellular captive portal reevaluation url" into oc-dr1-dev
Evan Laird [Mon, 10 Jul 2017 20:47:24 +0000 (20:47 +0000)]
Merge "Fix RTL mobile data type indicators" into oc-dr1-dev
am:
88da234e35
Change-Id: Idf63cdd6ce59a2e879c304392ebce93d5f01cb77
TreeHugger Robot [Mon, 10 Jul 2017 20:36:07 +0000 (20:36 +0000)]
Merge "Fix RTL mobile data type indicators" into oc-dr1-dev
Jason Monk [Mon, 10 Jul 2017 20:29:25 +0000 (20:29 +0000)]
Merge "Add screensaver settings to backup list" into oc-dr1-dev
am:
2c3c58d917
Change-Id: I981327b35f341600f908d479d4a4d36356b18b1d
TreeHugger Robot [Mon, 10 Jul 2017 20:17:56 +0000 (20:17 +0000)]
Merge "Add screensaver settings to backup list" into oc-dr1-dev
fionaxu [Mon, 10 Jul 2017 16:34:07 +0000 (09:34 -0700)]
fix cellular captive portal reevaluation url
we apply redirection link as the url everywhere for cellular captive portal.
this url should only be used when load the portal page at the first place (when users
click on the notification) and shouldn't be used as the re-evaluation url
as it wont return the expected response code.
instead we should use special URL (generate_204) from connectivity
service which will return 204 if redirection is gone.
Test: manual test with cold and hot TMO SIM
Bug:
63351490
Bug:
62532802
Change-Id: I56bb03a58447c5c46758e692ff357d540ea4cd7b
Jason Monk [Mon, 10 Jul 2017 15:14:19 +0000 (11:14 -0400)]
Add screensaver settings to backup list
Test: manual
Change-Id: Icf47312e20b4ec44d02dc31ce575e89083a8be7d
Fixes:
35700553
Evan Laird [Mon, 10 Jul 2017 17:00:39 +0000 (13:00 -0400)]
Fix RTL mobile data type indicators
Data type indicators were drawing too big for their containers and
causing the data type overlays not to obey RTL. Also tweaked some sizes
to fix RTL.
Change-Id: I1aee7397976e77d2b834b163bf7fa7cf2a008968
Fixes:
62538496
Test: visual (RTL mode)
Winson Chung [Mon, 10 Jul 2017 17:18:45 +0000 (17:18 +0000)]
Merge "Fix issue with PiP touch drift." into oc-dr1-dev
am:
b544b81b53
Change-Id: Idf6f88cb33aa9ba39c67f83419b18c03ef829ed2
Winson Chung [Mon, 10 Jul 2017 17:12:35 +0000 (17:12 +0000)]
Merge "Fix issue with PiP touch drift." into oc-dr1-dev
Julia Reynolds [Mon, 10 Jul 2017 17:06:23 +0000 (17:06 +0000)]
Merge "Limit the number of notis an app can enqueue" into oc-dr1-dev
am:
c65071d625
Change-Id: I85e7117a88be1a629a953f1c721faba508d6d424
Lucas Dupin [Mon, 10 Jul 2017 16:58:46 +0000 (16:58 +0000)]
Merge "Add theme style flag to WallpaperColors" into oc-dr1-dev
am:
8b94ef697e
Change-Id: Ic63c9dc9963846afd2ab854630d56512059609d9
Julia Reynolds [Mon, 10 Jul 2017 16:55:01 +0000 (16:55 +0000)]
Merge "Limit the number of notis an app can enqueue" into oc-dr1-dev
Lucas Dupin [Mon, 10 Jul 2017 16:49:33 +0000 (16:49 +0000)]
Merge "Add theme style flag to WallpaperColors" into oc-dr1-dev
Julia Reynolds [Mon, 10 Jul 2017 16:02:37 +0000 (16:02 +0000)]
Merge "Rate limit notification sounds/vibrations" into oc-dr1-dev
am:
00d83ea50f
Change-Id: I9228a7b79f4c8f438fceb462128d16eddda2b563
TreeHugger Robot [Mon, 10 Jul 2017 15:57:32 +0000 (15:57 +0000)]
Merge "Rate limit notification sounds/vibrations" into oc-dr1-dev
Neil Fuller [Mon, 10 Jul 2017 14:42:02 +0000 (14:42 +0000)]
Merge "Configure the package name of the updater app" am:
ed3e6d47ff am:
e293f7ee0d
am:
fa04abb74e
Change-Id: I8239ffae3bfd5b8414482c5e486f62af5b1bdf31
Neil Fuller [Mon, 10 Jul 2017 14:33:52 +0000 (14:33 +0000)]
Merge "Configure the package name of the updater app" am:
ed3e6d47ff
am:
e293f7ee0d
Change-Id: I5cf0cabc7c7abbce7a9c1181f40706966cafebfb
Bryce Lee [Mon, 10 Jul 2017 14:30:25 +0000 (14:30 +0000)]
Merge "Add app bounds to Configuration#compareTo." into oc-dr1-dev
am:
649053810f
Change-Id: Ifc8c8e2df9296072f1c5746cff0bc005755b60a8
Neil Fuller [Mon, 10 Jul 2017 14:26:32 +0000 (14:26 +0000)]
Merge "Configure the package name of the updater app"
am:
ed3e6d47ff
Change-Id: I6de319392c50bd8d6de56144d11333d18701fcdb
Bryce Lee [Mon, 10 Jul 2017 14:21:37 +0000 (14:21 +0000)]
Merge "Add app bounds to Configuration#compareTo." into oc-dr1-dev
Neil Fuller [Mon, 10 Jul 2017 14:14:46 +0000 (14:14 +0000)]
Merge "Configure the package name of the updater app"
Lorenzo Colitti [Mon, 10 Jul 2017 14:04:48 +0000 (14:04 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error." am:
9c170157a8 am:
97e7afe8d0
am:
856a887361
Change-Id: Ide3e67921fb2f1751c74e03d05d7eb7b83d26dca
Przemyslaw Szczepaniak [Mon, 10 Jul 2017 14:02:33 +0000 (14:02 +0000)]
Merge "Track libcore commit
2fd032687ba3d4d7f6af560482c5aba525584621" am:
c895fcef8f am:
03e304e4e8
am:
0d53000386
Change-Id: I7e6064ba6d0b74584eec526d61ebb46abc02ad4f
Neil Fuller [Mon, 10 Jul 2017 13:55:46 +0000 (13:55 +0000)]
Merge "Fix dumpsys output for staged install version" am:
7fc43b1fbd am:
d725e7aeab
am:
e17e10a123
Change-Id: I49e05c4578478b893bc378e2a7b2f10e90727e89
Lorenzo Colitti [Mon, 10 Jul 2017 13:54:41 +0000 (13:54 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error." am:
9c170157a8
am:
97e7afe8d0
Change-Id: Icadae1e993287fd54e3c5f96b6773d713b8a1e6e
Hugo Benichi [Mon, 10 Jul 2017 13:53:58 +0000 (13:53 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." am:
d56856876f -s ours am:
ae62bb1d41
am:
6393105afb
Change-Id: I76dac07dd54ee15992d59a1e75eff5f3c2de6c25
Przemyslaw Szczepaniak [Mon, 10 Jul 2017 13:52:37 +0000 (13:52 +0000)]
Merge "Track libcore commit
2fd032687ba3d4d7f6af560482c5aba525584621" am:
c895fcef8f
am:
03e304e4e8
Change-Id: I3aadaccd191e59046db1ac138da71bbbc0261811
Neil Fuller [Mon, 10 Jul 2017 13:48:50 +0000 (13:48 +0000)]
Merge "Fix dumpsys output for staged install version" am:
7fc43b1fbd
am:
d725e7aeab
Change-Id: Ic5fdbbcfed2d840a74b01443d9ba5806b52f4745
Hugo Benichi [Mon, 10 Jul 2017 13:47:15 +0000 (13:47 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." am:
d56856876f -s ours
am:
ae62bb1d41
Change-Id: I92eceaf2295c7209166444248f0b1a719bef5f21
Lorenzo Colitti [Mon, 10 Jul 2017 13:43:02 +0000 (13:43 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error."
am:
9c170157a8
Change-Id: Ia4074f720ce0db69c86cd58ddc574d595cfceeee
Julia Reynolds [Wed, 5 Jul 2017 12:47:03 +0000 (08:47 -0400)]
Limit the number of notis an app can enqueue
In addition to the number they can post. Also decrease
the number of posts per second to 5, but allow finished
progress notifications through.
Fixes:
63173849
Fixes:
63167456
Test: runtests systemui-notification & simultaneously
downloading 5 files.
Change-Id: I0c8ea35b3d9d38b000ea5fe383515e1d5a26bac7
Przemyslaw Szczepaniak [Mon, 10 Jul 2017 13:40:49 +0000 (13:40 +0000)]
Merge "Track libcore commit
2fd032687ba3d4d7f6af560482c5aba525584621"
am:
c895fcef8f
Change-Id: I1aecc608b0eaa807489683526a9267003eb975b1
Neil Fuller [Mon, 10 Jul 2017 13:39:10 +0000 (13:39 +0000)]
Merge "Fix dumpsys output for staged install version"
am:
7fc43b1fbd
Change-Id: I14f5775c5347072365e0d84ad811078bf57c5855
Julia Reynolds [Mon, 19 Jun 2017 12:16:04 +0000 (08:16 -0400)]
Rate limit notification sounds/vibrations
1 alert per second.
Bug:
36662487
Test: runtest systemui-notification
Change-Id: I2046ae17b9e89ac0a83e182b91422fd242bc7557
Hugo Benichi [Mon, 10 Jul 2017 13:37:31 +0000 (13:37 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors."
am:
d56856876f -s ours
Change-Id: I6e4b778a7ea4ca9425834ed37c7f2b59cf458186
Treehugger Robot [Mon, 10 Jul 2017 12:15:47 +0000 (12:15 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error."
Treehugger Robot [Mon, 10 Jul 2017 12:00:31 +0000 (12:00 +0000)]
Przemyslaw Szczepaniak [Tue, 4 Jul 2017 09:32:11 +0000 (10:32 +0100)]
Track libcore commit
2fd032687ba3d4d7f6af560482c5aba525584621
Test: Make
Bug:
62779247
Change-Id: I919df93b20e809f42a27225403e1549b763b0a60
Treehugger Robot [Mon, 10 Jul 2017 11:52:11 +0000 (11:52 +0000)]
Merge "Fix dumpsys output for staged install version"
Hugo Benichi [Mon, 10 Jul 2017 11:42:45 +0000 (11:42 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors."
Michal Karpinski [Fri, 7 Jul 2017 14:30:50 +0000 (15:30 +0100)]
Eliminate a race condition that could lead to calling PBT#finalizeBackup() twice
Calling finalizeBackup() the second time will most probably lead to underholding
the wakelock and system crash.
Bug:
63156509
Test: manual
Change-Id: Ic995ba4a65d749b80bf1f1d226d35a279a0d1b25
Lorenzo Colitti [Mon, 10 Jul 2017 10:05:13 +0000 (19:05 +0900)]
Make failure to set addrgenmode a non-fatal error.
Bug:
17613910
Test: bullhead builds, boots, connects to wifi
Change-Id: I310dcacc6784c13904fca79b839b5f4d94bfc45e
Hugo Benichi [Sat, 17 Jun 2017 04:36:35 +0000 (13:36 +0900)]
CaptivePortalLogin ignores some ssl errors.
This patch changes the ssl error handler of the captive portal login
activity to ignore errors for resources coming from a different hostname
that the top-level page currently loading.
This allows logging into misconfigured portals that incorrectly bans ssl
to some hostnames necessary for loading their portal login pages.
Bug:
62332137
Test: manually tested with captive portal entwork.
Change-Id: I05378ed74e678829e46fbeee18df916ec6ec2856
Erik Kline [Sat, 8 Jul 2017 07:28:40 +0000 (07:28 +0000)]
Merge "Add more logging to the Tethering SharedLog" am:
839cc0433f am:
0a76af09b1
am:
6999649f0d -s ours
Change-Id: I690d3d30b2e71275700ee3176a5e103ca18a4cb1
Erik Kline [Sat, 8 Jul 2017 07:21:40 +0000 (07:21 +0000)]
Merge "Add more logging to the Tethering SharedLog" am:
839cc0433f
am:
0a76af09b1
Change-Id: Ie3bd8e8a5d8911303cead707e0485c78ea7d055c
Erik Kline [Sat, 8 Jul 2017 07:14:59 +0000 (07:14 +0000)]
Merge "Add more logging to the Tethering SharedLog"
am:
839cc0433f
Change-Id: Ibc2c9989ee9c5980003a60b43345baafc2cd3c0c
Treehugger Robot [Sat, 8 Jul 2017 07:06:09 +0000 (07:06 +0000)]
Merge "Add more logging to the Tethering SharedLog"
Sundeep Ghuman [Sat, 8 Jul 2017 03:13:09 +0000 (03:13 +0000)]
Merge "Change initial value of mStaleScanResults to true." into oc-dr1-dev
am:
e72ec3cab2
Change-Id: If268b2db323fa52c92fccc1b259599a0be204b87
TreeHugger Robot [Sat, 8 Jul 2017 03:06:37 +0000 (03:06 +0000)]
Merge "Change initial value of mStaleScanResults to true." into oc-dr1-dev
Sundeep Ghuman [Wed, 5 Jul 2017 21:19:30 +0000 (14:19 -0700)]
Change initial value of mStaleScanResults to true.
In ag/
2409026 we introduced a stale scan result bit to prevent callbacks
from sticky broadcasts from occuring until we have fetched the latest
set of scan results. However, this initial value was set to false hence
there is a race condition in which the currently connected network can
still be shown without any other networks, as the scan results have not
yet been processed.
By changing the initial value to true, we address this race condition.
Bug: b/
62493360
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I5f2108e17d2c549e2176ccf64e640fbd4808b5f1
Lucas Dupin [Sat, 8 Jul 2017 00:26:50 +0000 (00:26 +0000)]
Merge "Moving color extraction classes" into oc-dr1-dev
am:
456cb9603a
Change-Id: I6e1d6a124f9937b06648859333290f643ccc0150
TreeHugger Robot [Sat, 8 Jul 2017 00:21:44 +0000 (00:21 +0000)]
Merge "Moving color extraction classes" into oc-dr1-dev
Winson Chung [Fri, 7 Jul 2017 21:49:49 +0000 (14:49 -0700)]
Fix issue with PiP touch drift.
- Fix issue with cumulative truncation of positions causing a large x/y
error causing drift. Instead of using the rounded stack position,
keep track of the cumulative delta and apply that on each move.
Bug:
62541932
Test: Pip activity, move around with finger and ensure no drift
Change-Id: Ic7737a6b19672ee8a1d98fd57f84a1d89f4a17e9
Etan Cohen [Fri, 7 Jul 2017 23:21:05 +0000 (23:21 +0000)]
Merge "[AWARE] Fix close guard method name" into oc-dr1-dev
am:
9aabf29541
Change-Id: Ibdf4c9f91a41ba68c2d5ece4615a12e101638471
Derek Tan [Fri, 7 Jul 2017 23:18:54 +0000 (23:18 +0000)]
Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev
am:
f1328fee0d
Change-Id: I8646c7983330beaf90f7935d01675f33df2bf7ef
Wale Ogunwale [Fri, 7 Jul 2017 23:17:26 +0000 (23:17 +0000)]
Merge "Don't remove starting window for visible app." into oc-dr1-dev
am:
d4b83f96f8
Change-Id: I0be58fbdffafd87919fe259914af3855e3768b0f
Etan Cohen [Fri, 7 Jul 2017 23:13:34 +0000 (23:13 +0000)]
Merge "[AWARE] Fix close guard method name" into oc-dr1-dev
Derek Tan [Fri, 7 Jul 2017 23:12:44 +0000 (23:12 +0000)]
Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev
Wale Ogunwale [Fri, 7 Jul 2017 23:09:55 +0000 (23:09 +0000)]
Merge "Don't remove starting window for visible app." into oc-dr1-dev
Amith Yamasani [Fri, 7 Jul 2017 21:50:29 +0000 (21:50 +0000)]
Merge "Add logging for unusually long read times" into oc-dr1-dev
am:
2a8a58ea98
Change-Id: Ic043ad8fd15aac4583be3944190b52f3e914c6d7
TreeHugger Robot [Fri, 7 Jul 2017 21:43:46 +0000 (21:43 +0000)]
Merge "Add logging for unusually long read times" into oc-dr1-dev
Kouji Shiotani [Fri, 7 Jul 2017 21:39:39 +0000 (21:39 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats" am:
87e893a449 am:
1249e0a1b0
am:
03f4ddb1b2
Change-Id: Iafd1e341d6e1054453bf1db6d880abe227fac631
Lucas Dupin [Thu, 29 Jun 2017 19:20:29 +0000 (12:20 -0700)]
Add theme style flag to WallpaperColors
Theme colors should always be the same in sysui and launcher.
We're now sharing a hint HINT_SUPPORTS_DARK_THEME, to make sure
we're never out of sync.
Test: runtest -x tests/Internal/src/android/app/WallpaperColorsTest.java
Fixes:
63140091
Change-Id: Ibd196f540d77269df377804b0f4d4d0d20820067
Kouji Shiotani [Fri, 7 Jul 2017 21:34:32 +0000 (21:34 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats" am:
87e893a449
am:
1249e0a1b0
Change-Id: I962bd3c6dee3d635c6f5b56f2141e8f785fa4cfb
Kouji Shiotani [Fri, 7 Jul 2017 21:28:43 +0000 (21:28 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats"
am:
87e893a449
Change-Id: I3b63fa6c8fa88b182d4a9f2442022dc45a692d46
Treehugger Robot [Fri, 7 Jul 2017 21:20:40 +0000 (21:20 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats"
Evan Laird [Fri, 7 Jul 2017 19:47:57 +0000 (19:47 +0000)]
Merge "Fix RTL drawing for QS tiles in edit mode" into oc-dr1-dev
am:
845a4035ae
Change-Id: I6474c59be48650b2e5f6ea45489c59b8bb36d3cd
Evan Laird [Fri, 7 Jul 2017 19:44:58 +0000 (19:44 +0000)]
Merge "Update brightness icon to rounded one" into oc-dr1-dev
am:
1948abac4a
Change-Id: I9ebd8fd915a1292682785e5742da8b98563b893e
jackqdyulei [Fri, 7 Jul 2017 19:40:08 +0000 (19:40 +0000)]
Merge "Make BatterySaverTile controlled by pluggIn state" into oc-dr1-dev
am:
0ff3a3a11c
Change-Id: I271ee0902cef0554e02e5a268488986366e3dbf9
TreeHugger Robot [Fri, 7 Jul 2017 19:37:19 +0000 (19:37 +0000)]
Merge "Fix RTL drawing for QS tiles in edit mode" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 19:34:49 +0000 (19:34 +0000)]
Merge "Update brightness icon to rounded one" into oc-dr1-dev
Julia Reynolds [Fri, 7 Jul 2017 19:31:57 +0000 (19:31 +0000)]
Merge "Allow setup apps to colorize notifications." into oc-dr1-dev
am:
e4101089bb
Change-Id: I14f8f499ac62ed47d40ca9b2a7bff0c79120dcd7
TreeHugger Robot [Fri, 7 Jul 2017 19:31:54 +0000 (19:31 +0000)]
Merge "Make BatterySaverTile controlled by pluggIn state" into oc-dr1-dev
Julia Reynolds [Fri, 7 Jul 2017 19:24:37 +0000 (19:24 +0000)]
Merge "Allow setup apps to colorize notifications." into oc-dr1-dev
Android Build Merger (Role) [Fri, 7 Jul 2017 19:18:31 +0000 (19:18 +0000)]
Merge "Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev am:
1cdf4244f4 am:
465810c895" into oc-dr1-dev-plus-aosp
Andrew Solovay [Fri, 7 Jul 2017 19:17:12 +0000 (19:17 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev am:
1cdf4244f4
am:
465810c895
Change-Id: I6a9fa071f8e48c36cb0c9fdece919b6be0e8dc51
Andrew Solovay [Fri, 7 Jul 2017 19:15:29 +0000 (19:15 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev am:
1cdf4244f4
am:
bc4dc42887
Change-Id: I96a162db5fc80ab578a206ca13bd193a33762a64
Adrian Roos [Fri, 7 Jul 2017 19:12:31 +0000 (19:12 +0000)]
Merge "AOD: Block when fingerprint is already authenticated but waiting for goingToSleep to complete" into oc-dr1-dev
am:
eacef7a03a
Change-Id: I8e29473caf7c1cbef065909b0b40212b82648a95
Andrew Solovay [Fri, 7 Jul 2017 19:09:39 +0000 (19:09 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev
am:
1cdf4244f4
Change-Id: I1c25c17f1f73e4006e3b0fa9479d5b0563c6be98
Andrew Solovay [Fri, 7 Jul 2017 19:08:56 +0000 (19:08 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev
am:
1cdf4244f4
Change-Id: I295298edcd7f26df46edb71924fa63038a381619