Commit Graph

57321 Commits

Author SHA1 Message Date
Gustav Sennton
0841ae58e5 Merge "Remove WebView-package-being-replaced logic from WebViewUpdateService." into nyc-dev am: eedcdb0
am: 6e06848

* commit '6e068483f22e93da06894de3d79bd5033d4e4d79':
  Remove WebView-package-being-replaced logic from WebViewUpdateService.
2016-03-18 11:00:10 +00:00
Gustav Sennton
6e068483f2 Merge "Remove WebView-package-being-replaced logic from WebViewUpdateService." into nyc-dev
am: eedcdb0

* commit 'eedcdb045283faa894ef7b00722ae69eb780ceae':
  Remove WebView-package-being-replaced logic from WebViewUpdateService.
2016-03-18 10:57:53 +00:00
Gustav Sennton
eedcdb0452 Merge "Remove WebView-package-being-replaced logic from WebViewUpdateService." into nyc-dev 2016-03-18 10:52:34 +00:00
Abhijith Shastry
3d16e77ba9 Merge "Update canCurrentUserBlockNumbers permissions javadoc." into nyc-dev am: f69a571
am: 56a7fac

* commit '56a7facea736e2eab43166566702f48dfd96b946':
  Update canCurrentUserBlockNumbers permissions javadoc.
2016-03-18 01:22:45 +00:00
Adam Powell
df022fd3ae Merge "Dispatch aggregated visibility when performing attachViewToParent" into nyc-dev am: a17fa70
am: 3fea04e

* commit '3fea04ee1b9c99c80f63fd078c230eb96067f565':
  Dispatch aggregated visibility when performing attachViewToParent
2016-03-18 01:22:42 +00:00
Abhijith Shastry
56a7facea7 Merge "Update canCurrentUserBlockNumbers permissions javadoc." into nyc-dev
am: f69a571

* commit 'f69a5717db94a25abaa850c69a2dbbbf3612bd4a':
  Update canCurrentUserBlockNumbers permissions javadoc.
2016-03-18 01:20:20 +00:00
Adam Powell
3fea04ee1b Merge "Dispatch aggregated visibility when performing attachViewToParent" into nyc-dev
am: a17fa70

* commit 'a17fa708e7eddeac7a757ca28130e12ed2c19e77':
  Dispatch aggregated visibility when performing attachViewToParent
2016-03-18 01:20:19 +00:00
Abhijith Shastry
f69a5717db Merge "Update canCurrentUserBlockNumbers permissions javadoc." into nyc-dev 2016-03-18 01:13:08 +00:00
Adam Powell
a17fa708e7 Merge "Dispatch aggregated visibility when performing attachViewToParent" into nyc-dev 2016-03-18 01:12:58 +00:00
Abhijith Shastry
3c8cd6acd7 Update canCurrentUserBlockNumbers permissions javadoc.
BUG: 27719849
Change-Id: I70ca39b572a8ae3349f6e162655e301ad2aaabb0
2016-03-17 17:03:39 -07:00
Chien-Yu Chen
483605c491 Merge "Camera2: Reconnect camera service for listeners" into nyc-dev am: 9d78716
am: 3699ef1

* commit '3699ef18905d49154314da76cffa12e546b1d7ef':
  Camera2: Reconnect camera service for listeners
2016-03-17 23:48:18 +00:00
Chien-Yu Chen
3699ef1890 Merge "Camera2: Reconnect camera service for listeners" into nyc-dev
am: 9d78716

* commit '9d78716131e40157ea449034847ee14536567aa1':
  Camera2: Reconnect camera service for listeners
2016-03-17 23:45:46 +00:00
Makoto Onuki
fd5e7ab3cf Merge "Improve ShortcutSrvice" into nyc-dev am: 45c1827
am: 706928d

* commit '706928df5d361e15623108a8f47fae28cad5a9d7':
  Improve ShortcutSrvice
2016-03-17 23:42:34 +00:00
Makoto Onuki
706928df5d Merge "Improve ShortcutSrvice" into nyc-dev
am: 45c1827

* commit '45c1827c37ba9d8ed3c644aee89e993e4e5288b1':
  Improve ShortcutSrvice
2016-03-17 23:37:49 +00:00
Chien-Yu Chen
9d78716131 Merge "Camera2: Reconnect camera service for listeners" into nyc-dev 2016-03-17 23:37:14 +00:00
Makoto Onuki
45c1827c37 Merge "Improve ShortcutSrvice" into nyc-dev 2016-03-17 23:33:04 +00:00
Siyamed Sinir
4bc3c9c100 resolve merge conflicts of 75bf818 to master
Change-Id: I351ef203a683d4c96f43dda26032d05b63726f57
2016-03-17 16:29:09 -07:00
Adam Powell
c5874094eb Dispatch aggregated visibility when performing attachViewToParent
attachViewToParent is generally used for finishing a temporary detach
of a view as seen in ListView, etc. Have it dispatch aggregated
visibility to the newly added view so as to correctly update the view
as to its new state.

Bug 27702014

Change-Id: Ie8a67c78d3edf401641d52ce10bddf7cb49796fe
2016-03-17 16:27:24 -07:00
Siyamed Sinir
75bf818a89 Merge "Do not use hint text for Editor cursor positioning" into nyc-dev
am: e7a414e

* commit 'e7a414e16d5130a5fd066182750944d9861f2e7a':
  Do not use hint text for Editor cursor positioning
2016-03-17 23:03:28 +00:00
Siyamed Sinir
e7a414e16d Merge "Do not use hint text for Editor cursor positioning" into nyc-dev 2016-03-17 22:58:35 +00:00
Phil Weaver
1977da4488 Merge "Treat accessibility actions as user activity" into nyc-dev am: 6fdd3af
am: 5d9c243

* commit '5d9c2436f22008937e2829c34aa35103abbafcdd':
  Treat accessibility actions as user activity
2016-03-17 22:27:26 +00:00
Phil Weaver
5d9c2436f2 Merge "Treat accessibility actions as user activity" into nyc-dev
am: 6fdd3af

* commit '6fdd3afdcc43c1dec03ee82e9e1d69e88170d932':
  Treat accessibility actions as user activity
2016-03-17 22:25:06 +00:00
Phil Weaver
6fdd3afdcc Merge "Treat accessibility actions as user activity" into nyc-dev 2016-03-17 22:19:17 +00:00
Jeff Sharkey
78bcc89df4 Merge "Refactoring FBE APIs based on council feedback." into nyc-dev am: a0a58a2
am: 5a128c4

* commit '5a128c4f33aa38d3a35b5884519f6bd3a355512d':
  Refactoring FBE APIs based on council feedback.
2016-03-17 22:09:46 +00:00
Jeff Sharkey
5a128c4f33 Merge "Refactoring FBE APIs based on council feedback." into nyc-dev
am: a0a58a2

* commit 'a0a58a2fd5cbc1bb8056227bb04f276b364c6e96':
  Refactoring FBE APIs based on council feedback.
2016-03-17 22:07:23 +00:00
Jeff Sharkey
a0a58a2fd5 Merge "Refactoring FBE APIs based on council feedback." into nyc-dev 2016-03-17 22:00:26 +00:00
Makoto Onuki
aa8b94aa79 Improve ShortcutSrvice
- Delayed save
- Reset logic update

Bug 27548047

Change-Id: Ibd52f90a7986991974301b7ff1f1d8520f9ef0d9
2016-03-17 14:37:14 -07:00
Jeff Sharkey
8a372a0a28 Refactoring FBE APIs based on council feedback.
Mostly consists of removing the word "encryption" from most APIs,
since we can't actually make promises about the data being encrypted.

Bug: 27531029
Change-Id: Iace9d7c4e64716abf86ed11847c40f3947e1d625
2016-03-17 14:49:08 -06:00
Gustav Sennton
26c82fff09 Remove WebView-package-being-replaced logic from WebViewUpdateService.
The replacing-logic tries to handle packages being uninstalled while
being replaced. This can't be handled through listening to
package-replaced intents since those can be delivered long after the
actual problem occurs.

Bug: 27605997
Change-Id: Iba8e546a5bba1ceb6226d4edb71db088c81ae1a9
2016-03-17 20:29:43 +00:00
Sudheer Shanka
d7aa4c3bda Merge "Fix a race condition in SeekBarVolumizer." into nyc-dev am: 54f4a63
am: 422edce

* commit '422edce4ca8908c9f1afff51fbfb76fdb20a7473':
  Fix a race condition in SeekBarVolumizer.
2016-03-17 20:12:01 +00:00
Sudheer Shanka
422edce4ca Merge "Fix a race condition in SeekBarVolumizer." into nyc-dev
am: 54f4a63

* commit '54f4a630dcb66f0b6d5ae5b1028dc88d7971c99e':
  Fix a race condition in SeekBarVolumizer.
2016-03-17 20:09:39 +00:00
Adrian Roos
ce33edeaf4 Merge "Copy/Paste on RemoteInputView" into nyc-dev am: 237be37
am: 41bacba

* commit '41bacba9b39ef63752b121f78fcb05d84dc0eeac':
  Copy/Paste on RemoteInputView
2016-03-17 20:05:05 +00:00
Adrian Roos
41bacba9b3 Merge "Copy/Paste on RemoteInputView" into nyc-dev
am: 237be37

* commit '237be37fadda27be2bbb66aafb3e39ad0eefdc3b':
  Copy/Paste on RemoteInputView
2016-03-17 20:02:46 +00:00
Sudheer Shanka
54f4a630dc Merge "Fix a race condition in SeekBarVolumizer." into nyc-dev 2016-03-17 20:02:36 +00:00
Adrian Roos
237be37fad Merge "Copy/Paste on RemoteInputView" into nyc-dev 2016-03-17 19:55:19 +00:00
Andrii Kulian
103b77fb4c Merge "Add additional logging for incorrect activity stop" into nyc-dev am: 30b93a6
am: f01558e

* commit 'f01558e492f6be57d1cf2e7469decc2b595a1b9c':
  Add additional logging for incorrect activity stop
2016-03-17 19:43:05 +00:00
Adrian Roos
eca42af23b Merge "Fix action container visibility" into nyc-dev am: c2b2104
am: 572feb5

* commit '572feb5545529c4c747de3e100985a46ef13ad0e':
  Fix action container visibility
2016-03-17 19:43:02 +00:00
Jeremy Joslin
d84eee53dc Add a meteredHint to ScoredNetwork. am: 85870d6 am: 30db6d9
am: a0b0a38

* commit 'a0b0a384fb008a375b732531ca7fb984e59de29b':
  Add a meteredHint to ScoredNetwork.
2016-03-17 19:24:02 +00:00
Selim Gurun
3e5208d3f8 Merge "Revert "Revert "Add some View methods overrides and WebViewDelegate interfaces.""" into nyc-dev am: ed73839
am: 0900cfe

* commit '0900cfe0a6d49dcfaf533cf34c703d2688909e46':
  Revert "Revert "Add some View methods overrides and WebViewDelegate interfaces.""
2016-03-17 19:24:00 +00:00
Andrii Kulian
f01558e492 Merge "Add additional logging for incorrect activity stop" into nyc-dev
am: 30b93a6

* commit '30b93a6d9d6a2cc865b0db0c29c53fa13b29be63':
  Add additional logging for incorrect activity stop
2016-03-17 19:23:56 +00:00
Andrii Kulian
30b93a6d9d Merge "Add additional logging for incorrect activity stop" into nyc-dev 2016-03-17 19:19:20 +00:00
Adrian Roos
572feb5545 Merge "Fix action container visibility" into nyc-dev
am: c2b2104

* commit 'c2b21046193f84c5e3c1955e1f8c5986b4fdb487':
  Fix action container visibility
2016-03-17 19:12:22 +00:00
Selim Cinek
4c4ecb26a3 Merge "Decorated custom views now behave better if no custom view is set" into nyc-dev am: 62dfd5f
am: 8031be0

* commit '8031be0346e2964b1be7ea8ca6b446a0c00864da':
  Decorated custom views now behave better if no custom view is set
2016-03-17 19:09:41 +00:00
Makoto Onuki
20c9b4f5ef Merge "Support multi-launcher" into nyc-dev am: fb3f3f5
am: 7572efa

* commit '7572efad408d94ecbeed28aa7c2a89437ee8ac40':
  Support multi-launcher
2016-03-17 19:09:39 +00:00
Christopher Tate
e2a498a97e Merge "Lower the minimum period for periodic jobs to 15 minutes" into nyc-dev am: 943c68a
am: 022c4aa

* commit '022c4aa9e270dd0fe0b35cb02e66c6b49db78220':
  Lower the minimum period for periodic jobs to 15 minutes
2016-03-17 19:09:35 +00:00
Todd Kennedy
9c50f15043 Merge "update "dont kill" api" into nyc-dev am: ce71dee
am: cb62438

* commit 'cb624386e6329358c822aca93233e135f3c64f0a':
  update "dont kill" api
2016-03-17 19:09:25 +00:00
Seigo Nonaka
4dd82b3e79 Merge "Stop layout reset by setting empty locale list." into nyc-dev am: eb62f7f
am: f807598

* commit 'f80759878416f963c902747c07d1c55210b8a85a':
  Stop layout reset by setting empty locale list.
2016-03-17 19:09:24 +00:00
Glenn Kasten
029464aa06 Merge "Use audio_session_t consistently" into nyc-dev am: 58ae278
am: 028f3ae

* commit '028f3aec794cf5413f13ad866de8a56a3b1b5343':
  Use audio_session_t consistently
2016-03-17 19:09:21 +00:00
Torne (Richard Coles)
6dbb1acf70 Merge "Load WebView library into the right classloader namespace." into nyc-dev am: 3df6390
am: a9603e5

* commit 'a9603e5e283691e9243f439d7b8d01d7722a8163':
  Load WebView library into the right classloader namespace.
2016-03-17 19:09:11 +00:00
Sudheer Shanka
33194351fe Fix a race condition in SeekBarVolumizer.
Bug: 27355876
Bug: 27355810
Bug: 27355145
Change-Id: Ie33bf6aa92834076e3b8cf394c4d86400fb67592
2016-03-17 12:09:09 -07:00