Android Build Merger (Role)
9dca3a0060
Merge "Merge \\"Shortcut: Only \\"main\\" activities can have shortcuts.\\" into nyc-mr1-dev am: 1af9a58956 am: 312933e043"
2016-06-24 21:48:20 +00:00
Makoto Onuki
a9d2a39bb1
Merge \\"Shortcut: Only \\"main\\" activities can have shortcuts.\\" into nyc-mr1-dev am: 1af9a58956
...
am: 312933e043
2016-06-24 21:47:54 +00:00
TreeHugger Robot
57a289865b
Merge "Make getTransition a @TestApi for CTS tests."
2016-06-24 21:46:58 +00:00
Makoto Onuki
312933e043
Merge \"Shortcut: Only \"main\" activities can have shortcuts.\" into nyc-mr1-dev
...
am: 1af9a58956
2016-06-24 21:42:54 +00:00
Makoto Onuki
b08790c3b2
Shortcut: Only "main" activities can have shortcuts.
...
- Don't publish shortcuts when their target activities are not main.
- Only scan manifest shortcuts for main activities.
- When an app is updated, remove shortcuts that no longer belong to
valid main activities.
- Also re-publish manifest shortcuts after 'clear data'
- Also listen to PACKAGE_CHANGED and disable/re-publish shortcuts
properly.
Bug 29355786
Bug 29582255
Bug 29601844
Change-Id: I6c701ce669cf30a227bc2af4aa01de467ef73e3a
2016-06-24 13:07:17 -07:00
George Mount
f239f99113
Make getTransition a @TestApi for CTS tests.
...
Bug 29570647
Change-Id: I85b2b215fbad2ca72e67b17a29cc9b122ae5945e
2016-06-24 11:53:42 -07:00
Doris Liu
91fcf575f1
Merge \\"Fix NPE for checking for whether animators should play together\\" into nyc-mr1-dev am: 7f9c189f06
...
am: b53c9c1658
2016-06-24 17:58:08 +00:00
Doris Liu
b53c9c1658
Merge \"Fix NPE for checking for whether animators should play together\" into nyc-mr1-dev
...
am: 7f9c189f06
2016-06-24 17:53:06 +00:00
Doris Liu
7f9c189f06
Merge "Fix NPE for checking for whether animators should play together" into nyc-mr1-dev
2016-06-24 17:47:44 +00:00
Amith Yamasani
2e33e0df3c
Merge \\"Resetting some settings on starting a new demo session\\" into nyc-mr1-dev am: bb1fb395ca
...
am: 5c451c08bc
2016-06-24 16:42:47 +00:00
Suprabh Shukla
5c451c08bc
Merge \"Resetting some settings on starting a new demo session\" into nyc-mr1-dev
...
am: bb1fb395ca
2016-06-24 16:36:55 +00:00
Amith Yamasani
bb1fb395ca
Merge "Resetting some settings on starting a new demo session" into nyc-mr1-dev
2016-06-24 16:08:16 +00:00
Jorim Jaggi
584093c4bf
Merge \"Merge \\"Fix WallpaperInfo API review\\" into nyc-mr1-dev am: e3f410cd59\" into nyc-mr1-dev-plus-aosp
...
am: 17fedfbdc7
2016-06-24 01:38:10 +00:00
Jorim Jaggi
5cd3e8396d
Merge \"Fix WallpaperInfo API review\" into nyc-mr1-dev
...
am: e3f410cd59
2016-06-24 01:32:49 +00:00
TreeHugger Robot
e3f410cd59
Merge "Fix WallpaperInfo API review" into nyc-mr1-dev
2016-06-24 01:24:01 +00:00
Dmitri Plotnikov
abcc4392e9
Merge \\"Unhiding DEVICE_NAME\\" into nyc-mr1-dev am: b1ca092db8
...
am: 89858c58af
2016-06-24 00:37:57 +00:00
Suprabh Shukla
6472501f2e
Resetting some settings on starting a new demo session
...
Muting ringer and media volume and turning off the flashlight
before starting a new session. Also, resetting the configuration of any
new demo user to the configuration of user 0 on the device. Moved
RetailDemoModeService and RetailDemoModeServiceInternal to more
appropriate new packages
Bug: 29519612
Change-Id: Ib65f89ce61afab2d2f1b2dd0c761f5d35a466181
2016-06-23 17:36:19 -07:00
Dmitri Plotnikov
89858c58af
Merge \"Unhiding DEVICE_NAME\" into nyc-mr1-dev
...
am: b1ca092db8
2016-06-24 00:32:44 +00:00
Dmitri Plotnikov
b1ca092db8
Merge "Unhiding DEVICE_NAME" into nyc-mr1-dev
2016-06-24 00:23:13 +00:00
Doris Liu
c470466d7c
Fix NPE for checking for whether animators should play together
...
BUG: 29586505
Change-Id: Ic2a67d51d2ac8d5bfb11ed7773c7c7e413cc28c7
2016-06-24 00:01:39 +00:00
Jorim Jaggi
d136ba1664
Fix WallpaperInfo API review
...
Change-Id: I395b9617038450e6fa7a2f25bb55d6ae5f761015
Fixes: 29514598
2016-06-23 16:25:52 -07:00
Scott Main
b9d2791a65
Merge \"Merge \\\"fix bad contrast in table links by switching to normal table cells instead of headings.\\\" into nyc-dev am: fd0eeb0379 am: 8c9bd9cb28\" into nyc-mr1-dev-plus-aosp
...
am: 10aee22fa1
2016-06-23 22:19:42 +00:00
Fyodor Kupolov
1d84a7ffef
Merge \"Merge \\"Print names of observers causing timeout\\" into nyc-mr1-dev am: 38d7897690\" into nyc-mr1-dev-plus-aosp
...
am: a5b7b96500
2016-06-23 22:11:49 +00:00
Scott Main
afd1e8e259
Merge \\"fix bad contrast in table links by switching to normal table cells instead of headings.\\" into nyc-dev am: fd0eeb0379
...
am: 8c9bd9cb28
2016-06-23 22:10:29 +00:00
smain@google.com
b8516f1029
Merge \"fix bad contrast in table links by switching to normal table cells instead of headings.\" into nyc-dev
...
am: fd0eeb0379
2016-06-23 22:06:07 +00:00
smain@google.com
8c9bd9cb28
Merge \"fix bad contrast in table links by switching to normal table cells instead of headings.\" into nyc-dev
...
am: fd0eeb0379
2016-06-23 22:05:07 +00:00
Fyodor Kupolov
7ccd3241e0
Merge \"Print names of observers causing timeout\" into nyc-mr1-dev
...
am: 38d7897690
2016-06-23 21:58:36 +00:00
Scott Main
fd0eeb0379
Merge "fix bad contrast in table links by switching to normal table cells instead of headings." into nyc-dev
2016-06-23 21:57:52 +00:00
Fyodor Kupolov
38d7897690
Merge "Print names of observers causing timeout" into nyc-mr1-dev
2016-06-23 21:49:05 +00:00
Chong Zhang
b31d51b199
Merge \\"Do not send unhandled system config changes to app\\" into nyc-mr1-dev am: 568507abf5
...
am: fac7476990
2016-06-23 21:48:37 +00:00
Chong Zhang
fac7476990
Merge \"Do not send unhandled system config changes to app\" into nyc-mr1-dev
...
am: 568507abf5
2016-06-23 21:41:12 +00:00
Chong Zhang
568507abf5
Merge "Do not send unhandled system config changes to app" into nyc-mr1-dev
2016-06-23 21:33:55 +00:00
Jason Monk
099b337db9
Merge \\\"QS: Hacks to fix bigger problems in TileService binding\\\" into nyc-dev am: 1427bb3dc0 am: 955de27827
...
am: 1ae5fbb187
2016-06-23 21:12:32 +00:00
Jason Monk
1ae5fbb187
Merge \\"QS: Hacks to fix bigger problems in TileService binding\\" into nyc-dev am: 1427bb3dc0
...
am: 955de27827
2016-06-23 21:07:50 +00:00
Jason Monk
9981d94d54
Merge \"QS: Hacks to fix bigger problems in TileService binding\" into nyc-dev
...
am: 1427bb3dc0
2016-06-23 21:02:13 +00:00
Jason Monk
955de27827
Merge \"QS: Hacks to fix bigger problems in TileService binding\" into nyc-dev
...
am: 1427bb3dc0
2016-06-23 21:00:19 +00:00
Jason Monk
1427bb3dc0
Merge "QS: Hacks to fix bigger problems in TileService binding" into nyc-dev
2016-06-23 20:52:50 +00:00
Chong Zhang
4951f9d6f6
Do not send unhandled system config changes to app
...
If the config change is system-level and the app doesn't handle
it, it will definitely get relaunched and we don't need to call
onConfigurationChanged.
bug: 29367672
Change-Id: I3193d4b63d316295c9e73d42d000ab4eb5c1a6ad
2016-06-23 20:27:53 +00:00
smain@google.com
10e29b895e
fix bad contrast in table links by switching to normal table cells instead of headings.
...
Change-Id: I91139ac2f01a9e099ffb5f65f4579a0b33ced5ab
2016-06-23 12:09:30 -07:00
Jason Monk
6edbefdd54
QS: Hacks to fix bigger problems in TileService binding
...
Bug: 29121793
Change-Id: I9cb8d8ee36ce5cc77ba3c11decb1b3a797fd7999
2016-06-23 14:59:22 -04:00
Jeff Sharkey
c2c0442c23
Merge \\\"When uninstalling, only kill the requested user.\\\" into nyc-dev am: 060d5a0e0a am: 803a316d6e
...
am: bcc1353019
2016-06-23 18:50:50 +00:00
John Reck
bcc1353019
Merge \\"Remove FD from the right Looper\\" into nyc-dev am: db13dd41a9
...
am: c86a2e325e
2016-06-23 18:45:16 +00:00
John Reck
50e952fe74
Merge \"Remove FD from the right Looper\" into nyc-dev
...
am: db13dd41a9
2016-06-23 18:44:16 +00:00
Jeff Sharkey
d4ed628995
Merge \\\"When uninstalling, only kill the requested user.\\\" into nyc-dev am: 060d5a0e0a am: eaa1c9ae42
...
am: 68106fc9bb
2016-06-23 18:39:57 +00:00
John Reck
c86a2e325e
Merge \"Remove FD from the right Looper\" into nyc-dev
...
am: db13dd41a9
2016-06-23 18:39:44 +00:00
John Reck
db13dd41a9
Merge "Remove FD from the right Looper" into nyc-dev
2016-06-23 18:32:11 +00:00
Jeff Sharkey
68106fc9bb
Merge \\"When uninstalling, only kill the requested user.\\" into nyc-dev am: 060d5a0e0a
...
am: eaa1c9ae42
2016-06-23 18:21:59 +00:00
Jeff Sharkey
803a316d6e
Merge \"When uninstalling, only kill the requested user.\" into nyc-dev
...
am: 060d5a0e0a
2016-06-23 18:16:45 +00:00
Jeff Sharkey
eaa1c9ae42
Merge \"When uninstalling, only kill the requested user.\" into nyc-dev
...
am: 060d5a0e0a
2016-06-23 18:15:27 +00:00
Fyodor Kupolov
0b77ef9f51
Print names of observers causing timeout
...
Pass and store name in registerUserSwitchObserver and later print names of
observers causing timeout.
Bug: 29039588
Change-Id: I09c4bcc986168a07f5e20ad0f38667b783332288
2016-06-23 11:07:56 -07:00
