OSDN Git Service
Julia Reynolds [Tue, 25 Jul 2017 17:40:47 +0000 (17:40 +0000)]
Merge "Zen introduction text updates" into oc-dr1-dev
am:
60bf540e20
Change-Id: I3d094ed410060fd2ccb223a16020493f8893d88f
TreeHugger Robot [Tue, 25 Jul 2017 17:31:18 +0000 (17:31 +0000)]
Merge "Zen introduction text updates" into oc-dr1-dev
Tomasz Wasilczyk [Tue, 25 Jul 2017 17:18:50 +0000 (17:18 +0000)]
Merge "Rename ACCESS_FM_RADIO to ACCESS_BROADCAST_RADIO permission." into oc-mr1-dev
Adrian Roos [Tue, 25 Jul 2017 17:09:16 +0000 (17:09 +0000)]
Merge "AOD: Fix rotation during screen off (again)" into oc-dr1-dev
am:
9ffa87552b
Change-Id: I921b33e74287d7d629ff07f5afbd1909d5a785b1
TreeHugger Robot [Tue, 25 Jul 2017 17:00:22 +0000 (17:00 +0000)]
Merge "AOD: Fix rotation during screen off (again)" into oc-dr1-dev
Calin Juravle [Tue, 25 Jul 2017 16:54:06 +0000 (16:54 +0000)]
Merge "Fix system server compilation in ZygoteInit" into oc-mr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 16:13:08 +0000 (16:13 +0000)]
Merge "Add API for virtual preloads" into oc-mr1-dev
Winson Chung [Tue, 25 Jul 2017 15:56:22 +0000 (15:56 +0000)]
Merge "Disregard closing activities when blocking previous activities." into oc-dr1-dev
am:
f1f25ad5f2
Change-Id: I3289be6435be80db8fa76a0e14b0bdef0ce317ee
Pankaj Kanwar [Tue, 25 Jul 2017 15:54:44 +0000 (15:54 +0000)]
Merge "Default-disable tethering offload" into oc-dr1-dev
am:
1244ff1956
Change-Id: I289fb5e7cc41d617065c3358cc4810d1825c3ff0
Winson Chung [Tue, 25 Jul 2017 15:45:39 +0000 (15:45 +0000)]
Merge "Disregard closing activities when blocking previous activities." into oc-dr1-dev
Pankaj Kanwar [Tue, 25 Jul 2017 15:43:52 +0000 (15:43 +0000)]
Merge "Default-disable tethering offload" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 15:33:37 +0000 (15:33 +0000)]
Merge "Ambient indicator text color" into oc-mr1-dev
Julia Reynolds [Fri, 21 Jul 2017 15:15:52 +0000 (11:15 -0400)]
Zen introduction text updates
- Update color of text/button for legibility
- prevent poorly timed zen update broadcasts from interrupting the
zen footer window animation
Change-Id: I04eaaae80fb0647b0a792023f5ed03ebd9142e04
Fixes:
63916428
Fixes:
63815440
Test: manual
Adrian Roos [Tue, 25 Jul 2017 14:11:10 +0000 (14:11 +0000)]
Merge "Fingerprint: Show bouncer when fingerprint is disallowed" into oc-dr1-dev
am:
544e628e16
Change-Id: I2df5b364bbfde27299d5f5114224dd6bfaeaa782
Alex Sakhartchouk [Tue, 25 Jul 2017 14:09:10 +0000 (14:09 +0000)]
Merge "Follow up to "Add modified API to send more information to VrCore"" into oc-dr1-dev
am:
9b53851d58
Change-Id: I73f621eae44bc8cac298d9772b41c5d93eaa185e
Adrian Roos [Tue, 25 Jul 2017 14:01:07 +0000 (14:01 +0000)]
Merge "AOD: Skip prox check if cached prox value available" into oc-dr1-dev
am:
f96573f894
Change-Id: Ia89613aac856b104b32394d6040aa4694327cf55
TreeHugger Robot [Tue, 25 Jul 2017 13:55:35 +0000 (13:55 +0000)]
Merge "Fingerprint: Show bouncer when fingerprint is disallowed" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 13:54:25 +0000 (13:54 +0000)]
Merge "Follow up to "Add modified API to send more information to VrCore"" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 13:52:51 +0000 (13:52 +0000)]
Merge "AOD: Skip prox check if cached prox value available" into oc-dr1-dev
Todd Kennedy [Wed, 19 Jul 2017 19:49:30 +0000 (12:49 -0700)]
Add API for virtual preloads
Virtual preloads are applications that aren't actually on the
/system partition, but, act as if they were. One such distinction
is that these apps receive Intent.ACTION_BOOT_COMPLETED and start
out of the stopped state.
Change-Id: I812d3e7008b9d87e84aa33dbc4b3d8e8b334533c
Fix:
34855677
Test: Manual
Test: Install an app with "--preload"
Test: See that it receives Intent.ACTION_BOOT_COMPLETED
Adrian Roos [Tue, 25 Jul 2017 13:37:32 +0000 (15:37 +0200)]
AOD: Fix rotation during screen off (again)
Fixes another issue where the screen could rotate during the screen-off transition.
mAwake is still true during goingToSleep, but we should no longer play rotation
animations if we are going to sleep. Instead use the more appropriately named
okToAnimate.
Change-Id: I816d1552de3fea0a19ce42ca50d845eb46f80625
Fixes:
63760853
Test: Trigger show-when-locked navigation, rotate phone to landscape, trigger assistant, go to sleep. Verify no rotation plays; go/wm-smoke
Adrian Roos [Tue, 25 Jul 2017 11:54:28 +0000 (11:54 +0000)]
Merge "Keyguard: Remove fancy colon" into oc-dr1-dev
am:
55bc522d0d
Change-Id: I37e3b2ca2d54f9f84b3d309ba0b099bd032da65a
Adrian Roos [Tue, 25 Jul 2017 11:45:43 +0000 (11:45 +0000)]
Merge "Keyguard: Remove fancy colon" into oc-dr1-dev
Erik Kline [Tue, 25 Jul 2017 03:18:56 +0000 (12:18 +0900)]
Default-disable tethering offload
Test: runtest frameworks-net
Bug:
63250751
Change-Id: I63aa115e534123c46bd515bc099a601da45c5725
Ajay Panicker [Tue, 25 Jul 2017 02:19:31 +0000 (02:19 +0000)]
Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev
am:
aaf3860941
Change-Id: I627a6da4db6eb09b68e23882ccef2de4c80bf747
Alex Sakhartchouk [Tue, 25 Jul 2017 02:12:39 +0000 (22:12 -0400)]
Follow up to "Add modified API to send more information to VrCore"
Fixes corner case when the same component name first shows up as a
non VR activity, then again as VR.
Bug:
63709047
Test: Device launched to VR Home
Change-Id: I6f590185635cde06b0fba9f0e05ff6d6d586cfbb
Ajay Panicker [Tue, 25 Jul 2017 02:11:26 +0000 (02:11 +0000)]
Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev
Christine Franks [Tue, 25 Jul 2017 01:43:53 +0000 (01:43 +0000)]
Merge "Don't display QS security footer in demo mode" into oc-dr1-dev
am:
ae6776a839
Change-Id: Iace19d7405aae6b47fb33342dc3419921ebf6a5e
Calin Juravle [Mon, 24 Jul 2017 22:29:56 +0000 (15:29 -0700)]
Fix system server compilation in ZygoteInit
The code which dexopt SystemServer in ZygoteInit used to pass the
sharedLibrary string in the old format.
This CL updates the classPath string to the new class loader context
encoding.
Bug:
63941300
Test: compile WITH_DEXPREOPT=false and WITH_DEXPREOPT_BOOT_IMG_ONLY=false
and check that when the device boots the correct context is passed to
dex2oat.
(cherry picked from commit
b0dede3ec2e57a734fe17bef4920020c2d66488c)
Change-Id: Ie27cd21b0b9c8b7e226bce74dfa297569ac12317
Christine Franks [Tue, 25 Jul 2017 01:35:55 +0000 (01:35 +0000)]
Merge "Remove old configuration values for demo mode" into oc-dr1-dev
am:
e1132b4a39
Change-Id: I649457dd844320fbeb3a33d61ce8813aa0967157
Christine Franks [Tue, 25 Jul 2017 01:25:14 +0000 (01:25 +0000)]
Merge "Don't display QS security footer in demo mode" into oc-dr1-dev
Christine Franks [Tue, 25 Jul 2017 01:23:24 +0000 (01:23 +0000)]
Merge "Remove old configuration values for demo mode" into oc-dr1-dev
Kevin Chyn [Tue, 25 Jul 2017 01:22:06 +0000 (01:22 +0000)]
Merge "Default-off FP Swipe" into oc-dr1-dev
am:
76303759c4
Change-Id: I71e8b7288fad93041e0acef5e662b626f8b4f678
Lucas Dupin [Tue, 11 Jul 2017 19:10:56 +0000 (12:10 -0700)]
Ambient indicator text color
Ambient indicator needs to be aware of overlay changes and
doze states.
Fixes:
62276116
Test: together with ag/
2525169
Change-Id: Ia563ded294b2ebf862326f5831ee04ee11149625
Chen Xu [Tue, 25 Jul 2017 01:14:12 +0000 (01:14 +0000)]
Merge "proper cleanup onDestroy" into oc-dr1-dev
am:
c8f40de2dd
Change-Id: Ibf067cbbb041d0f0e79afbe554438d571f9a8d3e
TreeHugger Robot [Tue, 25 Jul 2017 01:03:14 +0000 (01:03 +0000)]
Merge "Default-off FP Swipe" into oc-dr1-dev
Chen Xu [Tue, 25 Jul 2017 01:00:23 +0000 (01:00 +0000)]
Merge "proper cleanup onDestroy" into oc-dr1-dev
Dianne Hackborn [Tue, 25 Jul 2017 00:26:36 +0000 (00:26 +0000)]
Merge "Add activity manager command to watch uid state changes." into oc-mr1-dev
Janis Danisevskis [Tue, 25 Jul 2017 00:11:05 +0000 (00:11 +0000)]
Merge "Refurbish granting mechanism" into oc-dr1-dev
am:
a4a68a1481 -s ours
Change-Id: I44c5504ba34c8b6f16901ac5d70073a3e69871a3
Salvador Martinez [Tue, 25 Jul 2017 00:05:50 +0000 (00:05 +0000)]
Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev
am:
f104b68a04
Change-Id: Id549831e1061088cefd261f460febcb7b3a3cb3f
TreeHugger Robot [Tue, 25 Jul 2017 00:05:30 +0000 (00:05 +0000)]
Merge "Refurbish granting mechanism" into oc-dr1-dev
TreeHugger Robot [Mon, 24 Jul 2017 23:52:28 +0000 (23:52 +0000)]
Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev
Fyodor Kupolov [Mon, 24 Jul 2017 23:23:12 +0000 (23:23 +0000)]
Merge "Handle onUnlockUser on fg thread" into oc-mr1-dev
fionaxu [Sat, 22 Jul 2017 01:02:30 +0000 (18:02 -0700)]
proper cleanup onDestroy
1. interrupt the sleeping testing thread onDestory to avoid
any thread keep running after onDestory.
2. add check of isFinishing() or isDestoryed() when the
testing thread wakeup.
3. detory the webview onDestory since there're chances that
some callbacks in WebChromeClient will try to open dialogs
while the container activity has been destroyed.
Bug:
63819703
Test: Manual test
Change-Id: Ida62d9d8e97e8c9f905ce2feab4ea265575baee8
Bryce Lee [Mon, 24 Jul 2017 22:13:35 +0000 (22:13 +0000)]
Merge "Determine power hint behavior based on target activity." into oc-dr1-dev
am:
b845700dee
Change-Id: Ic2430d0fd6f9a08d2f5aad612c79611adfa7d6b6
Bryce Lee [Mon, 24 Jul 2017 22:07:47 +0000 (22:07 +0000)]
Merge "Determine power hint behavior based on target activity." into oc-dr1-dev
TreeHugger Robot [Mon, 24 Jul 2017 21:23:38 +0000 (21:23 +0000)]
Merge "Update for less arguments in hidl toBinder." into oc-mr1-dev
Matthew Ng [Mon, 24 Jul 2017 21:17:23 +0000 (21:17 +0000)]
Merge "Android Recents implementation for low ram devices" into oc-mr1-dev
Kevin Chyn [Mon, 24 Jul 2017 21:00:22 +0000 (14:00 -0700)]
Default-off FP Swipe
Fixes:
63992836
Test: adb shell settings delete secure system_navigation_keys_enabled
&& make -j RunSettingsRoboTests
Change-Id: I6632c7244749b3b98227cb4392438ab861f3f815
Winson Chung [Mon, 24 Jul 2017 20:32:43 +0000 (20:32 +0000)]
Merge "Fixing occasional jump when launching certain apps from Recents." into oc-dr1-dev
am:
aa5937a366
Change-Id: I75c7bf10c58705dbe26ba60804fc18d1e8257906
Selim Cinek [Mon, 24 Jul 2017 20:26:19 +0000 (20:26 +0000)]
Merge "Fixed an issue where the lock icon could be invisible" into oc-dr1-dev
am:
106b5eefd2
Change-Id: Ic55a8e7a4a59dcad2b0472f9906fe4393313b5f9
Winson Chung [Mon, 24 Jul 2017 20:25:07 +0000 (20:25 +0000)]
Merge "Fixing occasional jump when launching certain apps from Recents." into oc-dr1-dev
TreeHugger Robot [Mon, 24 Jul 2017 20:21:15 +0000 (20:21 +0000)]
Merge "Don't create WindowNode on windows with dettached view." into oc-mr1-dev
Selim Cinek [Mon, 24 Jul 2017 20:19:30 +0000 (20:19 +0000)]
Merge "Fixed an issue where the lock icon could be invisible" into oc-dr1-dev
Felipe Leme [Mon, 24 Jul 2017 20:18:53 +0000 (20:18 +0000)]
Merge "DO NOT MERGE - Don't 'cmd vibrate' when on DND mode." into oc-dr1-dev
am:
9874ab69e5
Change-Id: I9dfeacca337dc93c39bc5c964b596655f2a7a0de
Robert Carr [Mon, 24 Jul 2017 20:13:47 +0000 (20:13 +0000)]
Merge "Ignore "mLastHidden" state when deciding whether to turnScreenOn." into oc-dr1-dev
am:
cf3b6afe01
Change-Id: Ibadb8f4808060e3d25fc93da5593abfcf819191b
TreeHugger Robot [Mon, 24 Jul 2017 20:08:31 +0000 (20:08 +0000)]
Merge "DO NOT MERGE - Don't 'cmd vibrate' when on DND mode." into oc-dr1-dev
Salvador Martinez [Sat, 22 Jul 2017 18:03:22 +0000 (11:03 -0700)]
move icon so that inline actions in settings can use it
Test: tests still pass
Bug:
62022517
Change-Id: Ifc01797c6ada51130586b5b42570c3357923ef85
TreeHugger Robot [Mon, 24 Jul 2017 20:04:02 +0000 (20:04 +0000)]
Merge "Ignore "mLastHidden" state when deciding whether to turnScreenOn." into oc-dr1-dev
Fyodor Kupolov [Fri, 14 Jul 2017 18:39:52 +0000 (11:39 -0700)]
Handle onUnlockUser on fg thread
AppWidgetService.onUserUnlocked can block ActivityManager thread
for 500+ ms. The code is guarded by mLock, so it's safe to simply
offload it to the worker thread without additional synchronization.
Test: Setup widgets/rebooted the device and unlocked
Test: Create/switch to guest user + setup widgets
Bug:
63389529
Change-Id: Ib3bc76f79bdbc707c0ac270d7fc35c8b27af9af0
Andrii Kulian [Mon, 24 Jul 2017 18:42:25 +0000 (18:42 +0000)]
Merge "DO NOT MERGE Add permission to launch activities on VD" into oc-mr1-dev
Janis Danisevskis [Fri, 9 Jun 2017 00:53:34 +0000 (17:53 -0700)]
Refurbish granting mechanism
Keystore stores key blobs in with filenames that include the symbolic
name and the uid of the owner. This behaviour should have been
completely opaque to the user keystore. However, the granting mechanism,
by which an app can allow another app to use one of its keys, leaked the
internal structure in that the grantee had to specify the key name with
the granter's uid prefix in order to use the granted key. This in turn
collided with prefix handling in other parts of the framework.
This patch refurbishes the granting mechanism such that keystore can
choose a name for the grant. It uses the original symbolic key name as
prefix and appends _KEYSTOREGRANT_<grant_no> where the grant_no is
chosen as first free slot starting from 0. Each uid has its own grant_no
space.
This changes the grant call such that it now returns a string, which is
the alias name of the newly created grant. The string is empty if the
grant operation failed.
As before apps can still mask granted keys by importing a key with the
exact same name including the added suffix. But everybody deserves the
right to shoot themselves in the foot if they really want to.
Bug:
37264540
Bug:
62237038
Test: run cts-dev --module CtsDevicePolicyManagerTestCases --test
com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement
because it grants a key
Merged-In: I047512ba345c25e6e691e78f7a37fc3f97b95d32
Change-Id: I047512ba345c25e6e691e78f7a37fc3f97b95d32
Makoto Onuki [Mon, 24 Jul 2017 17:42:31 +0000 (17:42 +0000)]
Merge "Don't keep parceled extras for history broadcasts." into oc-mr1-dev
Michael Wright [Mon, 24 Jul 2017 15:24:22 +0000 (15:24 +0000)]
Merge "Use new, lower brightness value for low brightness doze." into oc-dr1-dev
am:
f5c3922645
Change-Id: Icffd015c285e10255c2404fb9eeefaa6c63b230c
TreeHugger Robot [Mon, 24 Jul 2017 15:16:24 +0000 (15:16 +0000)]
Merge "Use new, lower brightness value for low brightness doze." into oc-dr1-dev
Christine Franks [Mon, 24 Jul 2017 14:47:05 +0000 (14:47 +0000)]
Merge "Remove reference to com.android.retaildemo" into oc-dr1-dev
am:
173e721ab6
Change-Id: I9937a58fffdbeefd9a6aace84dd977c2fe22aa09
Adrian Roos [Thu, 20 Jul 2017 18:06:54 +0000 (20:06 +0200)]
Keyguard: Remove fancy colon
The new fonts do not have a dedicated fancy colon for the lockscreen clock
and fall back to Roboto which breaks the kerning.
Change-Id: I4621c6248de3f42f6c3c49ee4149bc1c0bb233e6
Fixes:
63891134
Test: visual; runtest -x packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockAccessibilityDelegateTest.java
Adrian Roos [Mon, 24 Jul 2017 14:42:57 +0000 (16:42 +0200)]
AOD: Skip prox check if cached prox value available
On AOD, we run the proximity sensor, so when a pulse comes in,
there is no need to wait for a new result. Instead, we can use
the existing value if available.
Change-Id: Ibded081e5011a3053e6990012f97f63865e20298
Fixes:
63538693
Test: receive notification, verify that pulsing starts immediately and does not wait for the proximity check.
Christine Franks [Mon, 24 Jul 2017 14:33:46 +0000 (14:33 +0000)]
Merge "Remove reference to com.android.retaildemo" into oc-dr1-dev
Jorim Jaggi [Mon, 24 Jul 2017 14:14:34 +0000 (14:14 +0000)]
Revert "Fix jank when switching themes"
am:
6498f96283
Change-Id: Ie5813f1c04a6db9d5ee291df764873900add5064
Jorim Jaggi [Mon, 24 Jul 2017 13:51:41 +0000 (15:51 +0200)]
Revert "Fix jank when switching themes"
This reverts commit
e5d0b9dddbcd8e6be7725a89b82fb990db2dade7.
Fixes crashloop with lock pattern
Change-Id: I3721444c91e2be625c59ec3e6ba14f1080badc07
Fixes:
63980375
Michael Wright [Mon, 24 Jul 2017 12:52:43 +0000 (12:52 +0000)]
Merge "Remove non-safe mode boot vibration." into oc-dr1-dev
am:
149ff697ff
Change-Id: Ie8964116ffb3dccd6b683f0fff764d128107ac4f
TreeHugger Robot [Mon, 24 Jul 2017 12:46:25 +0000 (12:46 +0000)]
Merge "Remove non-safe mode boot vibration." into oc-dr1-dev
Selim Cinek [Sun, 23 Jul 2017 12:57:19 +0000 (12:57 +0000)]
Merge "Removing contents hidden string for public notifications" into oc-dr1-dev
am:
8650c7c0f1
Change-Id: I10d7ab191f47bf167a5be5e0d11d7698aae58cd1
TreeHugger Robot [Sun, 23 Jul 2017 12:51:43 +0000 (12:51 +0000)]
Merge "Removing contents hidden string for public notifications" into oc-dr1-dev
Android Build Merger (Role) [Sat, 22 Jul 2017 17:10:31 +0000 (17:10 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
51e35963ae -s ours" into oc-mr1-dev
Bill Yi [Sat, 22 Jul 2017 17:09:06 +0000 (17:09 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
51e35963ae -s ours
Change-Id: I54774e5f20216a738ba315f5fdaaac6e6f89c60a
TreeHugger Robot [Sat, 22 Jul 2017 17:09:04 +0000 (17:09 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 22 Jul 2017 17:02:45 +0000 (17:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 22 Jul 2017 16:55:48 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sat, 22 Jul 2017 16:55:05 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 22 Jul 2017 16:39:09 +0000 (16:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
69e41a4e9c -s ours
Change-Id: I9ee8162c0015297eee31e5254ee9347f92cbdc5c
TreeHugger Robot [Sat, 22 Jul 2017 16:31:16 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 22 Jul 2017 16:27:38 +0000 (16:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
86817456ff -s ours
Change-Id: I44c91d899d1718557316d1f9bec1d87613d47fbd
TreeHugger Robot [Sat, 22 Jul 2017 16:21:57 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 22 Jul 2017 09:47:35 +0000 (02:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1670c714954e5835f6c79f446c463ee18d72d17b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 22 Jul 2017 09:42:31 +0000 (02:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifa292630f4aba2e8129bfb6e0bc5de3fcad5d6fb
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 22 Jul 2017 06:43:49 +0000 (23:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ida215c44df2fd5572b046d426bca7304947398bc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 22 Jul 2017 06:28:53 +0000 (23:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icbe8f5431d45b87a584b611ce2c8569fd830d9f9
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Lucas Dupin [Sat, 22 Jul 2017 04:52:31 +0000 (04:52 +0000)]
Merge "Fix jank when switching themes" into oc-dr1-dev
am:
a74f575ff9
Change-Id: Ibc8fa59cfa6139b03aa7fb08361eb43331484be5
TreeHugger Robot [Sat, 22 Jul 2017 04:46:19 +0000 (04:46 +0000)]
Merge "Fix jank when switching themes" into oc-dr1-dev
Bill Yi [Sat, 22 Jul 2017 03:58:50 +0000 (20:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8c164681df192fe74083e69adf301a0f312dc144
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 22 Jul 2017 03:42:48 +0000 (20:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibde0d25cf7cd630ac63d57c865e906a28739d48a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Matthew Fritze [Sat, 22 Jul 2017 03:37:46 +0000 (03:37 +0000)]
Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev
am:
1cc73a5773
Change-Id: Iebb70bf9db4c3eabf0aecd07a0ecf9178ff8944b
TreeHugger Robot [Sat, 22 Jul 2017 03:31:53 +0000 (03:31 +0000)]
Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev
TreeHugger Robot [Sat, 22 Jul 2017 03:01:02 +0000 (03:01 +0000)]
Merge "Expose shared buffer mode/auto refresh on Surface" into oc-mr1-dev
Christine Franks [Tue, 27 Jun 2017 23:46:26 +0000 (16:46 -0700)]
Remove reference to com.android.retaildemo
Bug:
62712426
Test: runtest -c UserManagerTest frameworks-services
Change-Id: I26ca7e7dbf4ea44d2cb4a173072eac0037d75eca
TreeHugger Robot [Sat, 22 Jul 2017 01:07:36 +0000 (01:07 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-mr1-dev
Christine Franks [Wed, 19 Jul 2017 14:46:34 +0000 (07:46 -0700)]
Remove old configuration values for demo mode
Bug:
62712426
Test: make -j100
Change-Id: Ibe8a89208ba93d7074800f087798678371f72fb8
Makoto Onuki [Sat, 22 Jul 2017 00:57:59 +0000 (00:57 +0000)]
Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
am:
5bbf44e715
Change-Id: Icb54710f8a76f674c75c79e9992eb03264ff3142