OSDN Git Service
android-build-team Robot [Fri, 15 Sep 2017 05:52:57 +0000 (05:52 +0000)]
Merge cherrypicks of [
2905832,
2906321,
2905732,
2906078,
2905510,
2905511,
2905512,
2905513,
2906336,
2906337,
2904895,
2905833,
2906322,
2906079,
2906080] into oc-mr1-release
Change-Id: Iaafc56b6c1bcea605cfd039bd73c4beadf7c9520
Lucas Dupin [Thu, 14 Sep 2017 00:24:09 +0000 (17:24 -0700)]
Do not animate icons when leaving AoD
Change-Id: I10ff1f06f6f699c0b0ceedffa54b463fdf25593f
Fixes:
37433524
Test: screenrecord # look at video frame by frame
(cherry picked from commit
8274aa9f25662a24f39fe50f0512122aa89acfcb)
Lucas Dupin [Wed, 13 Sep 2017 23:34:58 +0000 (16:34 -0700)]
Show big text on AoD
Test: Receive notification, look at AoD
Change-Id: I4ccb33895b5acf12a6341c22c853b0cf75036497
Fixes:
64128466
(cherry picked from commit
06c5e642aa58ec62408ac5f18d046f0892efda1d)
jackqdyulei [Wed, 6 Sep 2017 23:38:23 +0000 (16:38 -0700)]
Change battery icon to the side of bt icon
Also add a new parameter to control the size of battery icon at
the side.
In spec the height of battery icon should be 55% of the bt icon.
Since bt icon has different natural margin in its vector drawable.
This cl adds a padding and then change the ratio to 75%.
Bug:
65397557
Test: RunSettingsLibRoboTests
Change-Id: I442149392edcec2ee23f651232ffe3e204badc38
(cherry picked from commit
98b7fdbd5c11af30afdf147d0c4cc44fe4ef240a)
android-build-team Robot [Thu, 14 Sep 2017 07:25:25 +0000 (07:25 +0000)]
release-request-
f0fc1aa1-730c-4deb-b1ff-
e8ebeeccc4b5-for-git_oc-mr1-release-
4335659 snap-temp-L85900000102427279
Change-Id: Ib5cfbca39fb48291e177d8238e8cfd64d6d18c5a
Jakub Pawlowski [Wed, 13 Sep 2017 16:33:34 +0000 (09:33 -0700)]
Bluetooth: thread-safe callback invocation
Bug:
65596701
Test: manual
Change-Id: I92a436328a3070ea842e8e652891e485406c2ed7
Merged-In: I92a436328a3070ea842e8e652891e485406c2ed7
(cherry picked from commit
3eb569fc72781857f1f2722bb645a6090a9b53ce)
Jakub Pawlowski [Thu, 14 Sep 2017 02:32:28 +0000 (02:32 +0000)]
Merge "Bluetooth: fix GATT race conditions when using Handler" into oc-mr1-dev
Bill Yi [Thu, 14 Sep 2017 01:43:50 +0000 (01:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
5b812c8df6 -s ours am:
98313f5996 -s ours am:
95dd448a5e -s ours
am:
abc3417961 -s ours
Change-Id: I61c531101305b5875be83847991d4514cc773511
Bill Yi [Thu, 14 Sep 2017 01:39:21 +0000 (01:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b53e9cf4a2 -s ours am:
8eb6ff0212 -s ours am:
c8ede1e966 -s ours
am:
ea94475791 -s ours
Change-Id: I2c90c8467634d338d1eebe8cdfdfa0de6cb0902b
TreeHugger Robot [Thu, 14 Sep 2017 01:35:42 +0000 (01:35 +0000)]
Merge "vendor apk is unbundled" into oc-mr1-dev
Android Build Merger (Role) [Thu, 14 Sep 2017 01:35:01 +0000 (01:35 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c00cf0a49d -s ours am:
2b492b6502 -s ours am:
8d1cdbb135 -s ours am:
1186c6ec45 -s ours" into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 01:25:22 +0000 (01:25 +0000)]
Merge "Fixed an issue where the pattern wouldn't show properly" into oc-mr1-dev
Bill Yi [Thu, 14 Sep 2017 01:24:43 +0000 (01:24 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c00cf0a49d -s ours am:
2b492b6502 -s ours am:
8d1cdbb135 -s ours
am:
1186c6ec45 -s ours
Change-Id: I44ea9e39a0c4dfcf5da7d0415d6c941a2a93d686
Bill Yi [Thu, 14 Sep 2017 01:17:51 +0000 (01:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7cc053233b -s ours am:
fc0a43743e -s ours am:
8d0a15c4f5 -s ours
am:
3989c8b1f7 -s ours
Change-Id: I607c1016f3eb395ebc015e362c00d4ac1914e1ce
Bill Yi [Thu, 14 Sep 2017 01:14:07 +0000 (01:14 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7804b17f0e -s ours am:
b7c6238556 -s ours am:
a690e7362d -s ours
am:
2dd51799b2 -s ours
Change-Id: I0594a7e4f0eaaa2ab607ecbf6dab50e64d72fe33
Bill Yi [Thu, 14 Sep 2017 01:05:27 +0000 (01:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
5b812c8df6 -s ours am:
98313f5996 -s ours
am:
95dd448a5e -s ours
Change-Id: I9dabad9b8dbfb88c9c41fb9334730e3d9a13b822
Bill Yi [Thu, 14 Sep 2017 01:01:00 +0000 (01:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b69531f99e -s ours am:
16bc5f15b7 -s ours am:
69259c2b32 -s ours
am:
9ebfe48df5 -s ours
Change-Id: Id4c8b1da2079dcc92deefbecd6faa18df2651597
Bill Yi [Thu, 14 Sep 2017 01:00:57 +0000 (01:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b53e9cf4a2 -s ours am:
8eb6ff0212 -s ours
am:
c8ede1e966 -s ours
Change-Id: Ic177de299decf09261daf18f8a0b779bf10727de
Bill Yi [Thu, 14 Sep 2017 00:54:20 +0000 (00:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
37f29b0359 -s ours am:
4f8b486f69 -s ours am:
0dd2e975ca -s ours
am:
bcbc39e695 -s ours
Change-Id: I875a747924bd5f89ae7b73b6282bd9cd878c5c71
Bill Yi [Thu, 14 Sep 2017 00:53:06 +0000 (00:53 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c00cf0a49d -s ours am:
2b492b6502 -s ours
am:
8d1cdbb135 -s ours
Change-Id: I5ae31f699edb0155b27dacccea4ed5972f8cb666
Bill Yi [Thu, 14 Sep 2017 00:49:39 +0000 (00:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7cc053233b -s ours am:
fc0a43743e -s ours
am:
8d0a15c4f5 -s ours
Change-Id: I69b7c005b4dc5b4c63743a7a315bf2aa3e4e290a
Bill Yi [Thu, 14 Sep 2017 00:47:57 +0000 (00:47 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
f9075cb448 -s ours am:
c0ccea9bf5 -s ours am:
4e72aa2314 -s ours
am:
797dca48c9 -s ours
Change-Id: Ie697f29340feabdd2f5c0c729afbe6ba571f119f
Bill Yi [Thu, 14 Sep 2017 00:39:22 +0000 (00:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c016ef25c8 -s ours am:
318728fd6b -s ours am:
9ce3cc9c78 -s ours
am:
0973e9a34e -s ours
Change-Id: I7246fb14f24a8ed13fe663570672a95c196f4210
Bill Yi [Thu, 14 Sep 2017 00:37:57 +0000 (00:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7804b17f0e -s ours am:
b7c6238556 -s ours
am:
a690e7362d -s ours
Change-Id: Iffe01cedcfb01c31c9f89e3ddb459552934fb000
Bill Yi [Thu, 14 Sep 2017 00:35:58 +0000 (00:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9f5e95f64e -s ours am:
697f149acf -s ours am:
b5b1b7b505 -s ours
am:
eb29e3e357 -s ours
Change-Id: Iebb6da5d93e09f986e8092107b363b869efd7a05
Android Build Merger (Role) [Thu, 14 Sep 2017 00:31:51 +0000 (00:31 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
79bfe12e6b -s ours am:
1db479ee26 -s ours am:
1ff18ac097 -s ours am:
ac23d4afac -s ours" into oc-mr1-dev
Bill Yi [Thu, 14 Sep 2017 00:30:00 +0000 (00:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
79bfe12e6b -s ours am:
1db479ee26 -s ours am:
1ff18ac097 -s ours
am:
ac23d4afac -s ours
Change-Id: I3d314ff51d4294f927ef3eb7df257502c6326626
Android Build Merger (Role) [Thu, 14 Sep 2017 00:28:25 +0000 (00:28 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e5fe30c1b0 -s ours am:
9abe093864 -s ours am:
4c152ae488 -s ours am:
4379f07401 -s ours" into oc-mr1-dev
Bill Yi [Thu, 14 Sep 2017 00:28:00 +0000 (00:28 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b69531f99e -s ours am:
16bc5f15b7 -s ours
am:
69259c2b32 -s ours
Change-Id: Ied34ede3136f40d23dbbe9309afd13fbf5c1ca5d
Bill Yi [Thu, 14 Sep 2017 00:26:44 +0000 (00:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e5fe30c1b0 -s ours am:
9abe093864 -s ours am:
4c152ae488 -s ours
am:
4379f07401 -s ours
Change-Id: I9a4569287599b61d81034e0cc42cc446c8849cfd
Android Build Merger (Role) [Thu, 14 Sep 2017 00:24:55 +0000 (00:24 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
222cc10fee -s ours am:
289d6b71a9 -s ours am:
74e9007c7b -s ours am:
5e220d0800 -s ours" into oc-mr1-dev
Bill Yi [Thu, 14 Sep 2017 00:23:39 +0000 (00:23 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
37f29b0359 -s ours am:
4f8b486f69 -s ours
am:
0dd2e975ca -s ours
Change-Id: I9ce1bd9180a009958d9dd60d794235869e28529a
Bill Yi [Thu, 14 Sep 2017 00:22:26 +0000 (00:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
222cc10fee -s ours am:
289d6b71a9 -s ours am:
74e9007c7b -s ours
am:
5e220d0800 -s ours
Change-Id: I3a646b1f624767fc735474111f2adc71523e5b72
Android Build Merger (Role) [Thu, 14 Sep 2017 00:19:15 +0000 (00:19 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b484143b40 -s ours am:
307f6a4d92 -s ours am:
106e58f93c -s ours am:
9b4b22a52f -s ours" into oc-mr1-dev
Siyamed Sinir [Thu, 14 Sep 2017 00:18:31 +0000 (00:18 +0000)]
Merge "Fix ClipboardService device lock check for cross profile" into oc-mr1-dev
Bill Yi [Thu, 14 Sep 2017 00:17:51 +0000 (00:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
f9075cb448 -s ours am:
c0ccea9bf5 -s ours
am:
4e72aa2314 -s ours
Change-Id: Ic6a131df00ed57b03414e7708e91bc7faf9bccc9
Bill Yi [Thu, 14 Sep 2017 00:16:30 +0000 (00:16 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b484143b40 -s ours am:
307f6a4d92 -s ours am:
106e58f93c -s ours
am:
9b4b22a52f -s ours
Change-Id: I862aadc444f81d8941b9e9378f36063de71c1872
Dave Friedman [Thu, 14 Sep 2017 00:11:57 +0000 (00:11 +0000)]
Docs: Updating ANDROID_ID information to reflect Android O changes. Bug:
38270718 am:
4b3a4b58ed
am:
d1412d3d60
Change-Id: Ia63b719e65f0d82f7aa65fd4a74a442ffa27190d
Bill Yi [Thu, 14 Sep 2017 00:11:20 +0000 (00:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c016ef25c8 -s ours am:
318728fd6b -s ours
am:
9ce3cc9c78 -s ours
Change-Id: Ib3cf951855174e511b70e7e82fcf1041b654d9fd
Bill Yi [Thu, 14 Sep 2017 00:07:37 +0000 (00:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9f5e95f64e -s ours am:
697f149acf -s ours
am:
b5b1b7b505 -s ours
Change-Id: I3d7a232e2eaa57bc3225857cec63b20fd1b1999e
Bill Yi [Thu, 14 Sep 2017 00:00:27 +0000 (00:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
79bfe12e6b -s ours am:
1db479ee26 -s ours
am:
1ff18ac097 -s ours
Change-Id: Ie004d9ef022c5297e783e2e79db6adc05c31c1d3
Bill Yi [Wed, 13 Sep 2017 23:56:54 +0000 (23:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e5fe30c1b0 -s ours am:
9abe093864 -s ours
am:
4c152ae488 -s ours
Change-Id: I586e557c9257797642cafb7857ba1a2b60e3edee
Bill Yi [Wed, 13 Sep 2017 23:53:37 +0000 (23:53 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
222cc10fee -s ours am:
289d6b71a9 -s ours
am:
74e9007c7b -s ours
Change-Id: I3a7afab3700da0464ca24e2aa5e7ac73b756855f
Bill Yi [Wed, 13 Sep 2017 23:50:04 +0000 (23:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
5b812c8df6 -s ours
am:
98313f5996 -s ours
Change-Id: If26ea10608d586d3014bd99d2c27720d2316e37a
Bill Yi [Wed, 13 Sep 2017 23:49:38 +0000 (23:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b484143b40 -s ours am:
307f6a4d92 -s ours
am:
106e58f93c -s ours
Change-Id: I37e5c41fe54c5cc009da415395ae54e1c872f57d
Dave Friedman [Wed, 13 Sep 2017 23:42:48 +0000 (23:42 +0000)]
Docs: Updating ANDROID_ID information to reflect Android O changes. Bug:
38270718
am:
4b3a4b58ed
Change-Id: I2925d1d3bf70cebfb8d830a28a977208138d91af
Bill Yi [Wed, 13 Sep 2017 23:41:40 +0000 (23:41 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b53e9cf4a2 -s ours
am:
8eb6ff0212 -s ours
Change-Id: I6bf75581266953ee24347d9248a6f672a0db7651
Bill Yi [Wed, 13 Sep 2017 23:37:36 +0000 (23:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c00cf0a49d -s ours
am:
2b492b6502 -s ours
Change-Id: I1968606706a2c4a0041b4e26f08d3de5aa6e4046
Bill Yi [Wed, 13 Sep 2017 23:31:03 +0000 (23:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7cc053233b -s ours
am:
fc0a43743e -s ours
Change-Id: Idd71b32264c2fe1dc2b2cc572778882650170f81
Bill Yi [Wed, 13 Sep 2017 23:26:19 +0000 (23:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7804b17f0e -s ours
am:
b7c6238556 -s ours
Change-Id: Id8c25356f63b7755f305b6f88eaa49ebdb3903df
Bill Yi [Wed, 13 Sep 2017 23:18:12 +0000 (23:18 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
5b812c8df6 -s ours
Change-Id: Ie715aed27dae619de572006fe4a37210ac4cf21a
TreeHugger Robot [Wed, 13 Sep 2017 23:17:37 +0000 (23:17 +0000)]
Merge "Fix problem with empty AnimatorSet during fragment removal." into oc-mr1-dev
Bill Yi [Wed, 13 Sep 2017 23:14:37 +0000 (23:14 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b69531f99e -s ours
am:
16bc5f15b7 -s ours
Change-Id: I09bbb5157c9e43f348cba855db6430245c525c54
Bill Yi [Wed, 13 Sep 2017 23:12:27 +0000 (23:12 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
b53e9cf4a2 -s ours
Change-Id: Ibe71d1a15eba70b96675afcb711eaa46597ab82d
TreeHugger Robot [Wed, 13 Sep 2017 23:12:21 +0000 (23:12 +0000)]
Merge "Change score cache eviction time to settings value." into oc-mr1-dev
Bill Yi [Wed, 13 Sep 2017 23:11:18 +0000 (23:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
37f29b0359 -s ours
am:
4f8b486f69 -s ours
Change-Id: I915c191c0d807b6347df276661ad850d9ef7bd17
Bill Yi [Wed, 13 Sep 2017 23:08:34 +0000 (23:08 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
c00cf0a49d -s ours
Change-Id: Icaaa9992ba23d840e46ab7ab774dadb7c279ba7b
Bill Yi [Wed, 13 Sep 2017 23:05:48 +0000 (23:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
f9075cb448 -s ours
am:
c0ccea9bf5 -s ours
Change-Id: Ie82ec238bedf1d6b36fa027b466f1682c368f8c4
Bill Yi [Wed, 13 Sep 2017 23:05:08 +0000 (23:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
7cc053233b -s ours
Change-Id: I728dcfc27c89c3f9d494b06d1a09625e6b33b085
Bill Yi [Wed, 13 Sep 2017 23:00:53 +0000 (23:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
7804b17f0e -s ours
Change-Id: I828e11d0d99cf7f5081ab3e4ea67d86dc6d44e9f
Bill Yi [Wed, 13 Sep 2017 23:00:37 +0000 (23:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c016ef25c8 -s ours
am:
318728fd6b -s ours
Change-Id: I230701f9b32e0b51962459ac740ddcb446415b96
Bill Yi [Wed, 13 Sep 2017 22:54:23 +0000 (22:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
b69531f99e -s ours
Change-Id: I27d6736b64df7e2887de545008d99b1bb5418049
Bill Yi [Wed, 13 Sep 2017 22:52:33 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9f5e95f64e -s ours
am:
697f149acf -s ours
Change-Id: Iee1a8646963d52b43be7fc9de34cc88468b23bec
Bill Yi [Wed, 13 Sep 2017 22:48:33 +0000 (22:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
79bfe12e6b -s ours
am:
1db479ee26 -s ours
Change-Id: Icba327537143ff1f0753a31123e3f3feb2f862da
Bill Yi [Wed, 13 Sep 2017 22:47:26 +0000 (22:47 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
37f29b0359 -s ours
Change-Id: I8a446d3a47db4c97e7292a8b6322a12013807813
Selim Cinek [Sat, 9 Sep 2017 01:00:18 +0000 (18:00 -0700)]
Fixed an issue where the pattern wouldn't show properly
Because we were still collapsed, the height of the pattern
could still remain 0 and we would try to animate in a state
that doesn't make sense. we're now delaying it until we're
drawn.
Change-Id: I2588e5ccd45f1f472825e5502590a9890029a9b8
Fixes:
65441390
Test: follow steps on bug, observe normal pattern
Bill Yi [Wed, 13 Sep 2017 22:44:20 +0000 (22:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e5fe30c1b0 -s ours
am:
9abe093864 -s ours
Change-Id: I2f2564a295bdaa73cabc41ade774c3ced7d07e6b
Bill Yi [Wed, 13 Sep 2017 22:43:36 +0000 (22:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
f9075cb448 -s ours
Change-Id: Icabcb2f90bb9a1ab13ec338f8d57ae27bc540d2b
Jakub Pawlowski [Tue, 12 Sep 2017 21:48:30 +0000 (14:48 -0700)]
Bluetooth: fix GATT race conditions when using Handler
Bug:
65596701
Test: manual
Change-Id: Id703cea0543626bdd5a583da95615b650bbcc331
Merged-In: Id703cea0543626bdd5a583da95615b650bbcc331
Bill Yi [Wed, 13 Sep 2017 22:40:02 +0000 (22:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
222cc10fee -s ours
am:
289d6b71a9 -s ours
Change-Id: I30dcfc1b085a93df65ef63354e824c395ab8fecc
Bill Yi [Wed, 13 Sep 2017 22:39:09 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
c016ef25c8 -s ours
Change-Id: I96d9c99869652d2d1aad512772394ef433296b6d
Siyamed Sinir [Wed, 13 Sep 2017 19:19:41 +0000 (12:19 -0700)]
Fix ClipboardService device lock check for cross profile
ClipboardService.isDeviceLocked should clear callingIdentity before
accessing KeyguardManager.
Test: bit CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.ManagedProfileTest
Bug:
64934810
Change-Id: I712abfe8d542cd1be9c1816f407c8912321ac480
(cherry picked from commit
2fd9f7a0fe80436e55f93dd0deb6baf7bd2901c3)
Bill Yi [Wed, 13 Sep 2017 22:35:01 +0000 (22:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
9f5e95f64e -s ours
Change-Id: I2291d935b088a54cdb71524770c47b8be7dc97ae
Bill Yi [Wed, 13 Sep 2017 22:30:34 +0000 (22:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
79bfe12e6b -s ours
Change-Id: I5c0b3e5592d6e3912bdfbb264961fcc37b43a941
Bill Yi [Wed, 13 Sep 2017 21:31:42 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b484143b40 -s ours
am:
307f6a4d92 -s ours
Change-Id: Ibfc25bcb992c45a43c799412a7f47f6a12a77234
TreeHugger Robot [Wed, 13 Sep 2017 21:21:11 +0000 (21:21 +0000)]
Merge "MediaMuxer: Fix a typo in java doc." into oc-mr1-dev
Bill Yi [Wed, 13 Sep 2017 21:17:16 +0000 (21:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
e5fe30c1b0 -s ours
Change-Id: Ib28bd3a43d5fc857143345f25d63219f86149af5
Bill Yi [Wed, 13 Sep 2017 21:08:10 +0000 (21:08 +0000)]
Import translations. DO NOT MERGE
am:
ca913a6107 -s ours
Change-Id: Idc97f7644ef2f4de1e916a72e3b1c97b3dc62a86
Bill Yi [Wed, 13 Sep 2017 20:49:32 +0000 (20:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
222cc10fee -s ours
Change-Id: I711cdf888e217534fc50d3beae235cc516a28434
android-build-team Robot [Wed, 13 Sep 2017 20:28:54 +0000 (20:28 +0000)]
Merge cherrypicks of [
2891132] into oc-mr1-release
Change-Id: I95a2a3c5dabbf0260302a14f0234ed19534adcb3
Bryce Lee [Tue, 12 Sep 2017 16:50:35 +0000 (09:50 -0700)]
Update reference to top activity.
A condition dealing with a paused top activity references the last
paused activity rather than the top activity.
Bug:
65620111
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayTests#testExternalDisplayActivityTurnPrimaryOff
Change-Id: Ie67cb8b103e7dec59b1c0b40a5bb35ef0c3cb2b7
(cherry picked from commit
6a149f699eb35b4609d4c8b632ca3c014a6bd06b)
Sundeep Ghuman [Tue, 29 Aug 2017 00:04:16 +0000 (17:04 -0700)]
Change score cache eviction time to settings value.
Reduce default eviction time from intended 24 hours (erroneously input
as 24 days) to 20 minutes.
Bug: b/
63073866
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I89eae2483b9a65a65d7cf5b1151952609b6b7fd7
Merged-In: I89eae2483b9a65a65d7cf5b1151952609b6b7fd7
George Mount [Mon, 11 Sep 2017 18:01:51 +0000 (11:01 -0700)]
Fix problem with empty AnimatorSet during fragment removal.
Bug:
65354043
When an empty AnimatorSet is used in a fragment animation,
it can end immediately. This CL properly detects this
case and handles it properly.
Test: manual, ran fragment CTS
Change-Id: I63bee3818106f9c8e86cdc94af61d6bc8407c789
Bill Yi [Wed, 13 Sep 2017 20:07:25 +0000 (20:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
b484143b40 -s ours
Change-Id: I1b4a0545fe3e873bf3276e036f1f7edc067a25eb
TreeHugger Robot [Wed, 13 Sep 2017 19:55:54 +0000 (19:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 19:25:08 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 19:12:55 +0000 (19:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Andrew Lehmer [Wed, 13 Sep 2017 18:59:00 +0000 (18:59 +0000)]
Merge "AOD: Prewarm display while waiting for brightness sensor" into oc-mr1-dev
Hangyu Kuang [Wed, 13 Sep 2017 18:09:27 +0000 (11:09 -0700)]
MediaMuxer: Fix a typo in java doc.
Bug:
63965858
Test: None as just document.
Change-Id: I4c849a02c3b19d8cf23e92a960cfde023e213ca1
Kurt Nelson [Tue, 12 Sep 2017 22:40:23 +0000 (15:40 -0700)]
Fix javadoc typo
Change-Id: Id851e1752eba2f57ce7360619fee3b14417b053f
Docs: Fix typo in public StrictMode javadoc
Bug:
62204662
Test: make ds-docs
Bryce Lee [Wed, 13 Sep 2017 17:13:44 +0000 (17:13 +0000)]
Merge "Update reference to top activity." into oc-mr1-dev
Bryce Lee [Tue, 12 Sep 2017 16:50:35 +0000 (09:50 -0700)]
Update reference to top activity.
A condition dealing with a paused top activity references the last
paused activity rather than the top activity.
Bug:
65620111
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayTests#testExternalDisplayActivityTurnPrimaryOff
Change-Id: Ie67cb8b103e7dec59b1c0b40a5bb35ef0c3cb2b7
Dave Friedman [Thu, 15 Jun 2017 01:45:58 +0000 (18:45 -0700)]
Docs: Updating ANDROID_ID information to reflect Android O changes.
Bug:
38270718
Test: Verified on local build.
Change-Id: If4f86d261ae950cc14579aeba65c36a289cdf56c
Bill Yi [Wed, 13 Sep 2017 15:38:39 +0000 (08:38 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I3492feda7b5cb3fdec702165f8990f546b0d9896
Tomasz Wasilczyk [Wed, 13 Sep 2017 15:36:09 +0000 (15:36 +0000)]
Merge "Adjust AM/FM region ranges." into oc-mr1-dev
James Hawkins [Wed, 13 Sep 2017 15:11:20 +0000 (15:11 +0000)]
Merge "Tron/proto: Add ACTION and FIELD for logging the boot reason string value through metrics." into oc-mr1-dev
Tomasz Wasilczyk [Wed, 13 Sep 2017 14:47:45 +0000 (14:47 +0000)]
Merge "Implement missing mute call." into oc-mr1-dev
Bill Yi [Wed, 13 Sep 2017 12:54:50 +0000 (05:54 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I071832de264161e255329c1fa0a690e3a36aa12e
Bill Yi [Wed, 13 Sep 2017 10:39:53 +0000 (03:39 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Iedbbaa565e66794586d64f9961b5567926d50e32
Bill Yi [Wed, 13 Sep 2017 10:29:34 +0000 (03:29 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I019c359ed59734f67ca67f9dc732221cfee5c768
OSDN Git Service
