OSDN Git Service
Chong Zhang [Mon, 2 May 2016 17:43:26 +0000 (17:43 +0000)]
Merge "Do not update surface for dummy animation as long as transition is set" into nyc-dev am:
5b7a097b22
am:
001c43c584
* commit '
001c43c5842cf608c1e40598311dede1c935ffd3':
Do not update surface for dummy animation as long as transition is set
Change-Id: Ib5bfb541e40e9140065e6bf911ac19a90bd91a71
Chong Zhang [Mon, 2 May 2016 17:39:18 +0000 (17:39 +0000)]
Merge "Do not update surface for dummy animation as long as transition is set" into nyc-dev
am:
5b7a097b22
* commit '
5b7a097b22cae234a7b0e575bda063525989a985':
Do not update surface for dummy animation as long as transition is set
Change-Id: I860215a1cd62eb61cdae2e0d7ff8c74fd9eb9471
Chong Zhang [Mon, 2 May 2016 17:31:12 +0000 (17:31 +0000)]
Merge "Do not update surface for dummy animation as long as transition is set" into nyc-dev
Philip P. Moltmann [Mon, 2 May 2016 17:17:15 +0000 (17:17 +0000)]
Merge "Check if user is unlocked when handler is executed" into nyc-dev am:
beb3d2990b
am:
5d71224f85
* commit '
5d71224f854c8efb3c049fab57153866715d2c68':
Change-Id: I58170fec1782bb7cb10523f38f2d74ad92b4b7a8
Pavel Zhamaitsiak [Mon, 2 May 2016 17:17:12 +0000 (17:17 +0000)]
Merge "Connectivity Metrics service: dump throttling states to dumpsys" into nyc-dev am:
aabed1c5f8
am:
0307baf84b
* commit '
0307baf84b7bb0d6f1e259d21f4d302a43410822':
Change-Id: I45b3259dd96a52106a34736ed3443dea1a6042ff
Hangyu Kuang [Mon, 2 May 2016 17:17:08 +0000 (17:17 +0000)]
Merge "media: Add missing dobly-vision profile." into nyc-dev am:
66496d0d6d
am:
0d231c708b
* commit '
0d231c708b39a6eadf5f2c545f73b60b7e61e203':
Change-Id: I89e49e1a57fcebd584269a400a5e7a0e937da45a
Philip P. Moltmann [Mon, 2 May 2016 17:12:53 +0000 (17:12 +0000)]
Merge "Check if user is unlocked when handler is executed" into nyc-dev am:
beb3d2990b
am:
771f8d6b15
* commit '
771f8d6b159968fd3806c703b48b0fbb02fd22b7':
Check if user is unlocked when handler is executed
Change-Id: If8fb4c2b819ffce5f5816607ac483d9116207e42
Pavel Zhamaitsiak [Mon, 2 May 2016 17:12:50 +0000 (17:12 +0000)]
Merge "Connectivity Metrics service: dump throttling states to dumpsys" into nyc-dev am:
aabed1c5f8
am:
6619131b87
* commit '
6619131b87529265be8e6e7d211620bc137bf1bc':
Connectivity Metrics service: dump throttling states to dumpsys
Change-Id: I15ccf11ef16ac76c713083f23a99850e6ecd3bb2
Hangyu Kuang [Mon, 2 May 2016 17:12:46 +0000 (17:12 +0000)]
Merge "media: Add missing dobly-vision profile." into nyc-dev am:
66496d0d6d
am:
77a326e5f3
* commit '
77a326e5f366742577cb939746be1a0c8ce80965':
media: Add missing dobly-vision profile.
Change-Id: Id09ac400cab0e90871739a6f860e6df45bbaf87f
Philip P. Moltmann [Mon, 2 May 2016 17:08:29 +0000 (17:08 +0000)]
Merge "Check if user is unlocked when handler is executed" into nyc-dev
am:
beb3d2990b
* commit '
beb3d2990b2b480d06f465a8df4a6509ec4e098b':
Check if user is unlocked when handler is executed
Change-Id: I69ef2c5d8dee515d8392a48b7f70ab34644437e6
Pavel Zhamaitsiak [Mon, 2 May 2016 17:08:26 +0000 (17:08 +0000)]
Merge "Connectivity Metrics service: dump throttling states to dumpsys" into nyc-dev
am:
aabed1c5f8
* commit '
aabed1c5f8d2bdbcf4c854fadf9c50a8fd1bc0a6':
Connectivity Metrics service: dump throttling states to dumpsys
Change-Id: I1b626a6ab8c1be35673e5ec5a28062940f21c895
Philip P. Moltmann [Mon, 2 May 2016 17:08:23 +0000 (17:08 +0000)]
Merge "Check if user is unlocked when handler is executed" into nyc-dev
am:
beb3d2990b
* commit '
beb3d2990b2b480d06f465a8df4a6509ec4e098b':
Check if user is unlocked when handler is executed
Change-Id: I31d2777b1a06802aa2450c7d9242a4f1c5d555a5
Hangyu Kuang [Mon, 2 May 2016 17:08:21 +0000 (17:08 +0000)]
Merge "media: Add missing dobly-vision profile." into nyc-dev
am:
66496d0d6d
* commit '
66496d0d6d179116af5218d409ca64c5f0f16ed4':
media: Add missing dobly-vision profile.
Change-Id: I6d91bdc3da539e12c6e58e4b4c762fec0f68fc8c
Pavel Zhamaitsiak [Mon, 2 May 2016 17:08:20 +0000 (17:08 +0000)]
Merge "Connectivity Metrics service: dump throttling states to dumpsys" into nyc-dev
am:
aabed1c5f8
* commit '
aabed1c5f8d2bdbcf4c854fadf9c50a8fd1bc0a6':
Connectivity Metrics service: dump throttling states to dumpsys
Change-Id: I88679a6e2c75bbdd37ab43145314b8f7381a76a3
Hangyu Kuang [Mon, 2 May 2016 17:08:18 +0000 (17:08 +0000)]
Merge "media: Add missing dobly-vision profile." into nyc-dev
am:
66496d0d6d
* commit '
66496d0d6d179116af5218d409ca64c5f0f16ed4':
media: Add missing dobly-vision profile.
Change-Id: I81a3d3cd29120b07d5a3a2f45b0c582fa2c72962
Android Build Merger (Role) [Mon, 2 May 2016 17:07:53 +0000 (17:07 +0000)]
Merge "Merge "Update QS custom tile icons when they change" into nyc-dev am:
2c003c39e7 am:
c9095f3d9f" into nyc-mr1-dev-plus-aosp
Jason Monk [Mon, 2 May 2016 17:07:25 +0000 (17:07 +0000)]
Merge "Update QS custom tile icons when they change" into nyc-dev am:
2c003c39e7
am:
c9095f3d9f
* commit '
c9095f3d9ff82967623e3bdc65795fe04e634ba8':
Change-Id: Ib1fbc95e390ea0abe2b2320319098327cbcb85cb
Android Build Merger (Role) [Mon, 2 May 2016 17:04:59 +0000 (17:04 +0000)]
Merge "Merge "Update QS custom tile icons when they change" into nyc-dev am:
2c003c39e7 am:
c9095f3d9f" into nyc-mr1-dev-plus-aosp
Jason Monk [Mon, 2 May 2016 17:04:19 +0000 (17:04 +0000)]
Merge "Update QS custom tile icons when they change" into nyc-dev am:
2c003c39e7
am:
c9095f3d9f
* commit '
c9095f3d9ff82967623e3bdc65795fe04e634ba8':
Update QS custom tile icons when they change
Change-Id: I22d231639285172725aced09dec63cdc1423cdd5
Jason Monk [Mon, 2 May 2016 17:04:16 +0000 (17:04 +0000)]
Merge "Update QS custom tile icons when they change" into nyc-dev am:
2c003c39e7
am:
f7037689b3
* commit '
f7037689b398ef74ddb4c92dd6e3a9d42e11fe4d':
Update QS custom tile icons when they change
Change-Id: I9ae247fa65c33f84a9d59b370d9fdecccd632f3d
Android Build Merger (Role) [Mon, 2 May 2016 16:59:57 +0000 (16:59 +0000)]
Merge "Merge "Handle more config changes and handle onDestroy" into nyc-dev am:
383189f494 am:
b299051ac6" into nyc-mr1-dev-plus-aosp
Jason Monk [Mon, 2 May 2016 16:59:51 +0000 (16:59 +0000)]
Merge "Update QS custom tile icons when they change" into nyc-dev
am:
2c003c39e7
* commit '
2c003c39e7aa05f2515a849d99306a7d3538e978':
Update QS custom tile icons when they change
Change-Id: I34784783115b43ac1431736ea97801e803996a0a
Jason Monk [Mon, 2 May 2016 16:59:49 +0000 (16:59 +0000)]
Merge "Update QS custom tile icons when they change" into nyc-dev
am:
2c003c39e7
* commit '
2c003c39e7aa05f2515a849d99306a7d3538e978':
Update QS custom tile icons when they change
Change-Id: I2dfdb17f0a0c18d9fb44e997b04bc61fcea2aa1c
Philip P. Moltmann [Mon, 2 May 2016 16:59:18 +0000 (16:59 +0000)]
Merge "Handle more config changes and handle onDestroy" into nyc-dev am:
383189f494
am:
b299051ac6
* commit '
b299051ac6f8dba3ba2db69bab2721a21952a580':
Handle more config changes and handle onDestroy
Change-Id: I8f7a330922fd7a44857fac97b5003e8d699b0c9e
Philip P. Moltmann [Mon, 2 May 2016 16:59:06 +0000 (16:59 +0000)]
Merge "Check if user is unlocked when handler is executed" into nyc-dev
Philip P. Moltmann [Mon, 2 May 2016 16:59:06 +0000 (16:59 +0000)]
Merge "Handle more config changes and handle onDestroy" into nyc-dev am:
383189f494
am:
537f92dd5b
* commit '
537f92dd5bd7dce3d64e8b883a0c578f8c5ec52d':
Handle more config changes and handle onDestroy
Change-Id: I49f873991c663820f136d722f7dc873461fe130e
Pavel Zhamaitsiak [Mon, 2 May 2016 16:58:32 +0000 (16:58 +0000)]
Merge "Connectivity Metrics service: dump throttling states to dumpsys" into nyc-dev
Hangyu Kuang [Mon, 2 May 2016 16:55:36 +0000 (16:55 +0000)]
Merge "media: Add missing dobly-vision profile." into nyc-dev
Philip P. Moltmann [Mon, 2 May 2016 16:54:50 +0000 (16:54 +0000)]
Merge "Handle more config changes and handle onDestroy" into nyc-dev
am:
383189f494
* commit '
383189f494aba302555113ba6873a151bcb4a414':
Handle more config changes and handle onDestroy
Change-Id: I05285e96b8511dc8a6a21778a58dbb8d6cb97722
Philip P. Moltmann [Mon, 2 May 2016 16:54:49 +0000 (16:54 +0000)]
Merge "Handle more config changes and handle onDestroy" into nyc-dev
am:
383189f494
* commit '
383189f494aba302555113ba6873a151bcb4a414':
Handle more config changes and handle onDestroy
Change-Id: I5659ea33f9d2747cb866adab392c5f5a1ce3baac
Jason Monk [Mon, 2 May 2016 16:49:43 +0000 (16:49 +0000)]
Merge "Update QS custom tile icons when they change" into nyc-dev
Philip P. Moltmann [Fri, 29 Apr 2016 19:49:22 +0000 (12:49 -0700)]
Check if user is unlocked when handler is executed
When the user gets unlocked we schedule a handler-runnable to do cleanup work.
This runnable might be executed after the user is already locked again.
Fixes:
28512952
Change-Id: I6c05cbc8adab699e451565d74d56ad0f9b965954
Philip P. Moltmann [Mon, 2 May 2016 16:43:50 +0000 (16:43 +0000)]
Merge "Handle more config changes and handle onDestroy" into nyc-dev
Android Build Merger (Role) [Mon, 2 May 2016 16:42:02 +0000 (16:42 +0000)]
Merge "Merge "Keep STH state in sync with HAL" into nyc-dev am:
7cdc320a6b am:
b0fa8b0c55" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 2 May 2016 16:41:44 +0000 (16:41 +0000)]
Merge "Merge "Launch home activity in home stack if coming from ResolverActivity" into nyc-dev am:
b7d513cb47 am:
71a9d40911" into nyc-mr1-dev-plus-aosp
Chris Thornton [Mon, 2 May 2016 16:41:18 +0000 (16:41 +0000)]
Merge "Keep STH state in sync with HAL" into nyc-dev am:
7cdc320a6b
am:
b0fa8b0c55
* commit '
b0fa8b0c55b4af418e8137afe4dcb42a82a320ab':
Change-Id: Ic62c83ce8f0eb0f11ac1e3b970f4cc248f4b1227
Wale Ogunwale [Mon, 2 May 2016 16:41:15 +0000 (16:41 +0000)]
Merge "Launch home activity in home stack if coming from ResolverActivity" into nyc-dev am:
b7d513cb47
am:
71a9d40911
* commit '
71a9d409111655f15f8b4635ad1d20bf77e030b2':
Change-Id: I19f5518cf4feadf2125e1e9f851bf7ac5326b955
Android Build Merger (Role) [Mon, 2 May 2016 16:38:31 +0000 (16:38 +0000)]
Merge "Merge "Keep STH state in sync with HAL" into nyc-dev am:
7cdc320a6b am:
b0fa8b0c55" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 2 May 2016 16:38:17 +0000 (16:38 +0000)]
Merge "Merge "Launch home activity in home stack if coming from ResolverActivity" into nyc-dev am:
b7d513cb47 am:
71a9d40911" into nyc-mr1-dev-plus-aosp
Chris Thornton [Mon, 2 May 2016 16:37:41 +0000 (16:37 +0000)]
Merge "Keep STH state in sync with HAL" into nyc-dev am:
7cdc320a6b
am:
b0fa8b0c55
* commit '
b0fa8b0c55b4af418e8137afe4dcb42a82a320ab':
Keep STH state in sync with HAL
Change-Id: I217f91cd12fc8d89f76490c0847bbdbc8eb594fe
Wale Ogunwale [Mon, 2 May 2016 16:37:37 +0000 (16:37 +0000)]
Merge "Launch home activity in home stack if coming from ResolverActivity" into nyc-dev am:
b7d513cb47
am:
71a9d40911
* commit '
71a9d409111655f15f8b4635ad1d20bf77e030b2':
Launch home activity in home stack if coming from ResolverActivity
Change-Id: I79095b4dd9442ecd63d9950aacccd4fb15217a90
Chris Thornton [Mon, 2 May 2016 16:37:36 +0000 (16:37 +0000)]
Merge "Keep STH state in sync with HAL" into nyc-dev am:
7cdc320a6b
am:
de8601e2f3
* commit '
de8601e2f37692151d6c19b49547e1556f9127e5':
Keep STH state in sync with HAL
Change-Id: I354f7664173f5cdeb30b63c33de93c7aff23a2bb
Wale Ogunwale [Mon, 2 May 2016 16:37:33 +0000 (16:37 +0000)]
Merge "Launch home activity in home stack if coming from ResolverActivity" into nyc-dev am:
b7d513cb47
am:
6e5140c20e
* commit '
6e5140c20e4f6f2cce7c45eaf59c5f88f6e609a3':
Launch home activity in home stack if coming from ResolverActivity
Change-Id: I0b06751c1e3e81d444a92ae40025bd12e43a00b3
Chris Thornton [Mon, 2 May 2016 16:33:26 +0000 (16:33 +0000)]
Merge "Keep STH state in sync with HAL" into nyc-dev
am:
7cdc320a6b
* commit '
7cdc320a6be3ef285b8f0c7923c2a91ac618fbe3':
Keep STH state in sync with HAL
Change-Id: Ib44343ad166bec80f9d0b85f260f641dcaa09923
Chris Thornton [Mon, 2 May 2016 16:33:23 +0000 (16:33 +0000)]
Merge "Keep STH state in sync with HAL" into nyc-dev
am:
7cdc320a6b
* commit '
7cdc320a6be3ef285b8f0c7923c2a91ac618fbe3':
Keep STH state in sync with HAL
Change-Id: Icf6fd3d9416ce062703163a5f8f62e2d014bf89f
Wale Ogunwale [Mon, 2 May 2016 16:33:23 +0000 (16:33 +0000)]
Merge "Launch home activity in home stack if coming from ResolverActivity" into nyc-dev
am:
b7d513cb47
* commit '
b7d513cb47ba872bc3e3d4689a67bd05720f8569':
Launch home activity in home stack if coming from ResolverActivity
Change-Id: I9bb47ebde1c50552bc3d1b3944c6daefc34f6285
Wale Ogunwale [Mon, 2 May 2016 16:33:20 +0000 (16:33 +0000)]
Merge "Launch home activity in home stack if coming from ResolverActivity" into nyc-dev
am:
b7d513cb47
* commit '
b7d513cb47ba872bc3e3d4689a67bd05720f8569':
Launch home activity in home stack if coming from ResolverActivity
Change-Id: Id8d6f342ee8507aafd6fe95b103fdfd3b50118e5
Chris Thornton [Mon, 2 May 2016 16:26:18 +0000 (16:26 +0000)]
Merge "Keep STH state in sync with HAL" into nyc-dev
Android Build Merger (Role) [Mon, 2 May 2016 16:24:40 +0000 (16:24 +0000)]
Merge "Merge "Do not enforce unlocked state when there is no caller" into nyc-dev am:
b9f7541d9b am:
3b050a96b3" into nyc-mr1-dev-plus-aosp
Fyodor Kupolov [Mon, 2 May 2016 16:24:16 +0000 (16:24 +0000)]
Merge "Do not enforce unlocked state when there is no caller" into nyc-dev am:
b9f7541d9b
am:
3b050a96b3
* commit '
3b050a96b3cfd2b5ee5333baf7fdf231b8a0c277':
Change-Id: Id99e36ab10adea5e91a2a7755a607ec6bbca0452
TreeHugger Robot [Mon, 2 May 2016 16:21:40 +0000 (16:21 +0000)]
Merge "Launch home activity in home stack if coming from ResolverActivity" into nyc-dev
Android Build Merger (Role) [Mon, 2 May 2016 16:21:01 +0000 (16:21 +0000)]
Merge "Merge "Do not enforce unlocked state when there is no caller" into nyc-dev am:
b9f7541d9b am:
3b050a96b3" into nyc-mr1-dev-plus-aosp
Fyodor Kupolov [Mon, 2 May 2016 16:20:26 +0000 (16:20 +0000)]
Merge "Do not enforce unlocked state when there is no caller" into nyc-dev am:
b9f7541d9b
am:
3b050a96b3
* commit '
3b050a96b3cfd2b5ee5333baf7fdf231b8a0c277':
Do not enforce unlocked state when there is no caller
Change-Id: Ie2635d2df7d123b7a30fa91276aad0c31faf738c
Fyodor Kupolov [Mon, 2 May 2016 16:20:19 +0000 (16:20 +0000)]
Merge "Do not enforce unlocked state when there is no caller" into nyc-dev am:
b9f7541d9b
am:
c249970b39
* commit '
c249970b39fe9b139799d14ce4a9622dc31819e7':
Do not enforce unlocked state when there is no caller
Change-Id: I860e495254ae7715ecedfbcd05b4d291b4492659
Fyodor Kupolov [Mon, 2 May 2016 16:16:06 +0000 (16:16 +0000)]
Merge "Do not enforce unlocked state when there is no caller" into nyc-dev
am:
b9f7541d9b
* commit '
b9f7541d9bd8b0b37f04ea8244a8d0bd5fb97717':
Do not enforce unlocked state when there is no caller
Change-Id: I2dc6a40e469a37b5f41a2acbf1be176a56890abe
Fyodor Kupolov [Mon, 2 May 2016 16:16:02 +0000 (16:16 +0000)]
Merge "Do not enforce unlocked state when there is no caller" into nyc-dev
am:
b9f7541d9b
* commit '
b9f7541d9bd8b0b37f04ea8244a8d0bd5fb97717':
Do not enforce unlocked state when there is no caller
Change-Id: I2b8b00a730e7b0b27da6ad360b76c82c6bc1b178
Android Build Merger (Role) [Mon, 2 May 2016 16:07:58 +0000 (16:07 +0000)]
Merge "Merge "Visibility of pageRangeTitle =!= pageRangeText" into nyc-dev am:
8582909cae am:
cb60c8bf21" into nyc-mr1-dev-plus-aosp
Philip P. Moltmann [Mon, 2 May 2016 16:07:34 +0000 (16:07 +0000)]
Merge "Visibility of pageRangeTitle =!= pageRangeText" into nyc-dev am:
8582909cae
am:
cb60c8bf21
* commit '
cb60c8bf219f5a8423ffa69962a575ce8f8cfa9d':
Change-Id: Ice0f2ef5a8572b50d9471e03bee02ab6a1fae3d1
Fyodor Kupolov [Mon, 2 May 2016 16:05:39 +0000 (16:05 +0000)]
Merge "Do not enforce unlocked state when there is no caller" into nyc-dev
Android Build Merger (Role) [Mon, 2 May 2016 16:04:35 +0000 (16:04 +0000)]
Merge "Merge "Visibility of pageRangeTitle =!= pageRangeText" into nyc-dev am:
8582909cae am:
cb60c8bf21" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 2 May 2016 16:04:28 +0000 (16:04 +0000)]
Merge "Merge "Visibility of pageRangeTitle =!= pageRangeText" into nyc-dev am:
8582909cae am:
dee53b2457" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 2 May 2016 16:04:21 +0000 (16:04 +0000)]
Merge "Merge "Delay callback from printerRegistry after Constr." into nyc-dev am:
1f113db350 am:
1679077c48" into nyc-mr1-dev-plus-aosp
Philip P. Moltmann [Mon, 2 May 2016 16:03:47 +0000 (16:03 +0000)]
Merge "Visibility of pageRangeTitle =!= pageRangeText" into nyc-dev am:
8582909cae
am:
cb60c8bf21
* commit '
cb60c8bf219f5a8423ffa69962a575ce8f8cfa9d':
Visibility of pageRangeTitle =!= pageRangeText
Change-Id: Ib1a22025796e4a8ee097e491c8a643b48fa82707
Philip P. Moltmann [Mon, 2 May 2016 16:03:41 +0000 (16:03 +0000)]
Merge "Delay callback from printerRegistry after Constr." into nyc-dev am:
1f113db350
am:
1679077c48
* commit '
1679077c48609604792f6c64fcb48d246b517c37':
Delay callback from printerRegistry after Constr.
Change-Id: I7d5f46ca757f8b37e1e637c3ed87838467e65e72
Philip P. Moltmann [Mon, 2 May 2016 16:03:39 +0000 (16:03 +0000)]
Merge "Visibility of pageRangeTitle =!= pageRangeText" into nyc-dev am:
8582909cae
am:
dee53b2457
* commit '
dee53b2457e8161870f0a2b4885cc6268762ca06':
Visibility of pageRangeTitle =!= pageRangeText
Change-Id: I87a31b9091f4daad64fa5efc05cf451e1a5ee810
Philip P. Moltmann [Mon, 2 May 2016 16:03:37 +0000 (16:03 +0000)]
Merge "Delay callback from printerRegistry after Constr." into nyc-dev am:
1f113db350
am:
f1b849536b
* commit '
f1b849536b113f521f48d813f2df15e37ff47b45':
Delay callback from printerRegistry after Constr.
Change-Id: I219609d1fa3fbf4c828acda58fd80efcef1706bd
Philip P. Moltmann [Mon, 2 May 2016 15:59:06 +0000 (15:59 +0000)]
Merge "Visibility of pageRangeTitle =!= pageRangeText" into nyc-dev
am:
8582909cae
* commit '
8582909caefe952d02889e239642af945f64c03d':
Visibility of pageRangeTitle =!= pageRangeText
Change-Id: Ia480ef83e9e01a7d4487a621e35c65e601591605
Philip P. Moltmann [Mon, 2 May 2016 15:59:02 +0000 (15:59 +0000)]
Merge "Delay callback from printerRegistry after Constr." into nyc-dev
am:
1f113db350
* commit '
1f113db35095c8f43b702991dd68edc1ce398c82':
Delay callback from printerRegistry after Constr.
Change-Id: Id53fa594f297be742995ddfe309c89b3a67f6ac6
Philip P. Moltmann [Mon, 2 May 2016 15:59:01 +0000 (15:59 +0000)]
Merge "Visibility of pageRangeTitle =!= pageRangeText" into nyc-dev
am:
8582909cae
* commit '
8582909caefe952d02889e239642af945f64c03d':
Visibility of pageRangeTitle =!= pageRangeText
Change-Id: I89a018d8c3fa6394e8c4af93feab2463815fd2d7
Philip P. Moltmann [Mon, 2 May 2016 15:58:58 +0000 (15:58 +0000)]
Merge "Delay callback from printerRegistry after Constr." into nyc-dev
am:
1f113db350
* commit '
1f113db35095c8f43b702991dd68edc1ce398c82':
Delay callback from printerRegistry after Constr.
Change-Id: I7fbea2dc9cef8c37889616ac1ac694f253adf533
Philip P. Moltmann [Mon, 2 May 2016 15:49:59 +0000 (15:49 +0000)]
Merge "Visibility of pageRangeTitle =!= pageRangeText" into nyc-dev
Philip P. Moltmann [Mon, 2 May 2016 15:49:47 +0000 (15:49 +0000)]
Merge "Delay callback from printerRegistry after Constr." into nyc-dev
Wale Ogunwale [Sun, 1 May 2016 16:03:52 +0000 (09:03 -0700)]
Launch home activity in home stack if coming from ResolverActivity
ResolverActivity launches activities it resolves as the initial caller.
In the case of the home intent it can be sys-ui, but only the system
server is currently allow to launch things into the home stack, so the
resolved home activity is placed in non-home stack. This wasn’t a
visible problem in fullscreen mode as the user would notice since
everything is fullscreen, however it is very visible in multi-window mode.
We now allow home activities to be places in the home stack if it is coming
from the ResolverActivity.
Bug:
28487506
Change-Id: I68f81da68a207efab9ce911fa6661bd573f1e949
Android Build Merger (Role) [Mon, 2 May 2016 15:00:40 +0000 (15:00 +0000)]
Merge "Merge "Don\'t move stack to front when creating a task for activity to be started" into nyc-dev am:
a092aa436e am:
0a583debd4" into nyc-mr1-dev-plus-aosp
Wale Ogunwale [Mon, 2 May 2016 15:00:12 +0000 (15:00 +0000)]
Merge "Don\'t move stack to front when creating a task for activity to be started" into nyc-dev am:
a092aa436e
am:
0a583debd4
* commit '
0a583debd419d1db3a1c894f6fec47f0294e257d':
Change-Id: I77289bb83f9568a797d0daa005a60a3f8138d81c
Android Build Merger (Role) [Mon, 2 May 2016 14:56:56 +0000 (14:56 +0000)]
Merge "Merge "Don\'t move stack to front when creating a task for activity to be started" into nyc-dev am:
a092aa436e am:
0a583debd4" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 2 May 2016 14:56:50 +0000 (14:56 +0000)]
Merge "Merge "Don\'t move stack to front when creating a task for activity to be started" into nyc-dev am:
a092aa436e am:
f2f1b43a1a" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 2 May 2016 14:56:44 +0000 (14:56 +0000)]
Merge "Merge "Restrict updates of system packages" into nyc-dev am:
4e4fca43b0 am:
67cc0b2b8f" into nyc-mr1-dev-plus-aosp
Wale Ogunwale [Mon, 2 May 2016 14:56:12 +0000 (14:56 +0000)]
Merge "Don\'t move stack to front when creating a task for activity to be started" into nyc-dev am:
a092aa436e
am:
0a583debd4
* commit '
0a583debd419d1db3a1c894f6fec47f0294e257d':
Don't move stack to front when creating a task for activity to be started
Change-Id: I1f42f0a0acf1cdc169f445da5ce4f5f2344671a4
Wale Ogunwale [Mon, 2 May 2016 14:56:08 +0000 (14:56 +0000)]
Merge "Don\'t move stack to front when creating a task for activity to be started" into nyc-dev am:
a092aa436e
am:
f2f1b43a1a
* commit '
f2f1b43a1adc46cfa05d6f79a0ef469c0371c3bb':
Don't move stack to front when creating a task for activity to be started
Change-Id: I950063df448040b5618a9e68ebe41e9cad6cb305
Todd Kennedy [Mon, 2 May 2016 14:56:08 +0000 (14:56 +0000)]
Merge "Restrict updates of system packages" into nyc-dev am:
4e4fca43b0
am:
67cc0b2b8f
* commit '
67cc0b2b8f57c0dafded9b0c65f3cc54c27348aa':
Restrict updates of system packages
Change-Id: I964876246e334cab6cfdc097d7f8a6ad479565a5
Todd Kennedy [Mon, 2 May 2016 14:56:05 +0000 (14:56 +0000)]
Merge "Restrict updates of system packages" into nyc-dev am:
4e4fca43b0
am:
728b0978e5
* commit '
728b0978e5112f28b63ea8ff4a37bc14410a0813':
Restrict updates of system packages
Change-Id: Ic1a09e63e17f00b3ce38bd340c69cb416101a154
Wale Ogunwale [Mon, 2 May 2016 14:52:03 +0000 (14:52 +0000)]
Merge "Don\'t move stack to front when creating a task for activity to be started" into nyc-dev
am:
a092aa436e
* commit '
a092aa436eb1eaa0c9606a0a395f3b52ad9cccef':
Don't move stack to front when creating a task for activity to be started
Change-Id: Iba15accd2d7c97ee799fd1cf27206d88300ab06f
Wale Ogunwale [Mon, 2 May 2016 14:51:59 +0000 (14:51 +0000)]
Merge "Don\'t move stack to front when creating a task for activity to be started" into nyc-dev
am:
a092aa436e
* commit '
a092aa436eb1eaa0c9606a0a395f3b52ad9cccef':
Don't move stack to front when creating a task for activity to be started
Change-Id: I03cd1bd5764a90f91379663db31594c5af0e8d70
Todd Kennedy [Mon, 2 May 2016 14:51:59 +0000 (14:51 +0000)]
Merge "Restrict updates of system packages" into nyc-dev
am:
4e4fca43b0
* commit '
4e4fca43b0fb1320ce0265640d33b700cd886da8':
Restrict updates of system packages
Change-Id: Ifbfdbcc9056fddbd41ea6d690441cb3805f7c3ff
Todd Kennedy [Mon, 2 May 2016 14:51:57 +0000 (14:51 +0000)]
Merge "Restrict updates of system packages" into nyc-dev
am:
4e4fca43b0
* commit '
4e4fca43b0fb1320ce0265640d33b700cd886da8':
Restrict updates of system packages
Change-Id: Ie6e530365b1b805091f60ca4c5a3a2b1701409ca
Jason Monk [Mon, 2 May 2016 14:42:17 +0000 (10:42 -0400)]
Update QS custom tile icons when they change
When an app updates to change their default tile icon, pick up on
the change. When listening this comes from the TileLifecycleManager
and when not listening this guts picked up next time listening starts.
Change-Id: Ib730f02ed54ca1c1ba72ce50adf7dcf91f01738f
Fixes:
27911877
Wale Ogunwale [Mon, 2 May 2016 14:46:37 +0000 (14:46 +0000)]
Merge "Don't move stack to front when creating a task for activity to be started" into nyc-dev
Todd Kennedy [Mon, 2 May 2016 14:44:18 +0000 (14:44 +0000)]
Merge "Restrict updates of system packages" into nyc-dev
Android Build Merger (Role) [Mon, 2 May 2016 14:35:00 +0000 (14:35 +0000)]
Merge "Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581" into nyc-dev am:
f4810f5506 am:
700c64200e" into nyc-mr1-dev-plus-aosp
Nadia Benbernou [Mon, 2 May 2016 14:34:35 +0000 (14:34 +0000)]
Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581" into nyc-dev am:
f4810f5506
am:
700c64200e
* commit '
700c64200e378bd6ab9e7578594d817410de3a39':
Change-Id: I09d04ee229d86a359135b2c85dacf76be876a133
Android Build Merger (Role) [Mon, 2 May 2016 14:31:42 +0000 (14:31 +0000)]
Merge "Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581" into nyc-dev am:
f4810f5506 am:
700c64200e" into nyc-mr1-dev-plus-aosp
Nadia Benbernou [Mon, 2 May 2016 14:31:16 +0000 (14:31 +0000)]
Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581" into nyc-dev am:
f4810f5506
am:
700c64200e
* commit '
700c64200e378bd6ab9e7578594d817410de3a39':
Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581
Change-Id: I38fb376d6dca59641794e1c93bdbf044b6f568ac
Nadia Benbernou [Mon, 2 May 2016 14:31:14 +0000 (14:31 +0000)]
Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581" into nyc-dev am:
f4810f5506
am:
18210edc88
* commit '
18210edc8828289b68bef837276cc7d51c65e512':
Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581
Change-Id: I63ce6f04cbd0236a901db226854e7242a5972af2
Nadia Benbernou [Mon, 2 May 2016 14:26:46 +0000 (14:26 +0000)]
Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581" into nyc-dev
am:
f4810f5506
* commit '
f4810f5506203ac03439d1ed6e33e021540568f8':
Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581
Change-Id: I3a16e15adaf26be3528224c265be9a0e82957a38
Nadia Benbernou [Mon, 2 May 2016 14:26:44 +0000 (14:26 +0000)]
Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581" into nyc-dev
am:
f4810f5506
* commit '
f4810f5506203ac03439d1ed6e33e021540568f8':
Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581
Change-Id: Id88f0a6b35750313554ee2e52347ac51c45e88c8
Nadia Benbernou [Mon, 2 May 2016 14:15:45 +0000 (14:15 +0000)]
Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581" into nyc-dev
Android Build Merger (Role) [Mon, 2 May 2016 13:08:30 +0000 (13:08 +0000)]
Merge "Merge changes I86257bc8,I5c2221c5 into nyc-dev am:
4a992cbde8 am:
3ac235673c" into nyc-mr1-dev-plus-aosp
Lorenzo Colitti [Mon, 2 May 2016 13:07:57 +0000 (13:07 +0000)]
Merge changes I86257bc8,I5c2221c5 into nyc-dev am:
4a992cbde8
am:
3ac235673c
* commit '
3ac235673cc49f7648cef4710522cc2ce76021aa':
Change-Id: I125390376bc62c4a991125acb458518ccbeaac25
Android Build Merger (Role) [Mon, 2 May 2016 13:04:59 +0000 (13:04 +0000)]
Merge "Merge changes I86257bc8,I5c2221c5 into nyc-dev am:
4a992cbde8 am:
3ac235673c" into nyc-mr1-dev-plus-aosp
OSDN Git Service
