Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
240,383 Commits 3 Branches 0 Tags
fd5e7ab3cf01300bd21c33588a42e0ed60b81dce
Commit Graph

57305 Commits

Author SHA1 Message Date
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
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
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
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
Michal Karpinski
8f8e9e3d99 Merge "Unifying method names and comments to security logging, not device logging" into nyc-dev am: c7605b83 
am: e165d40

* commit 'e165d40d2d03cde6f8ed8da523b65553de800906':
  Unifying method names and comments to security logging, not device logging
 2016-03-17 19:09:08 +00:00
Adrian Roos
c2b2104619 Merge "Fix action container visibility" into nyc-dev 2016-03-17 19:07:01 +00:00
Adrian Roos
7052de55ed Fix action container visibility 
Bug: 27720398
Fixes: 27720398
Change-Id: I8ca4430c182ffdef81f5752d5d1bea0a4975e63f
 2016-03-17 19:06:18 +00:00
Keisuke Kuroyanagi
b111095a49 Merge "Fix: setExtractedText partial span change handling." into nyc-dev am: cb03689 
am: 9034132

* commit '903413269efa13a009bbf9149cee122572804fe4':
  Fix: setExtractedText partial span change handling.
 2016-03-17 18:55:14 +00:00
Keisuke Kuroyanagi
9884293440 Merge "Fix: setIntegerPart(long) doesn\'t set ARG_INTEGER_PART." into nyc-dev am: 17db42c 
am: 29f54ee

* commit '29f54ee6a12a78282ab0ec252f38f33d0bedba07':
  Fix: setIntegerPart(long) doesn't set ARG_INTEGER_PART.
 2016-03-17 18:55:13 +00:00
Daichi Hirono
c05301bee7 Merge "Add suffix number when copying a file." into nyc-dev am: 1360868 
am: 43202e7

* commit '43202e7d0de2b244ba0544e2a5dfa00f64e78777':
  Add suffix number when copying a file.
 2016-03-17 18:55:11 +00:00
Jeff Sharkey
8a52153c85 Merge "Oops, missed a default Bundle flag." into nyc-dev am: e6031bf 
am: da9a840

* commit 'da9a840c9b766b6c797d63fe104d422699a55cdd':
  Oops, missed a default Bundle flag.
 2016-03-17 18:55:09 +00:00
Yohei Yukawa
60efa1620d Merge changes I068f8821,Ibcf12746,I169ad495 into nyc-dev am: fb8aa06 
am: 55430e4

* commit '55430e477de6e5aaa5d61ec47b8b519f81a56556':
  Add more @NonNull/@Nullable to TextServicesSettings.
  Remove an unnecessary int to String conversion.
  Add more @NonNull/@Nullable to InputMethodSettings.
 2016-03-17 18:55:08 +00:00
Sunny Goyal
c0032cddce Merge "Adding a default implementation for the new Window.Callback method" into nyc-dev am: 60dbc35 
am: 04be477

* commit '04be4773d474f165ad4f36f88e78bef82eb2dd4c':
  Adding a default implementation for the new Window.Callback method
 2016-03-17 18:55:07 +00:00
Adam Powell
2786405c6c Merge "Refinement for onVisibilityAggregated" into nyc-dev am: 95ee171 
am: f929765

* commit 'f929765b78b64e6fcfb4c6747a3fa72db1ae3651':
  Refinement for onVisibilityAggregated
 2016-03-17 18:55:05 +00:00
Sudheer Shanka
09243d0451 Merge "Flush package restriction changes for a user." into nyc-dev am: f9124ec 
am: 3430c45

* commit '3430c45bcb10ca6ba4c67b2f5e273e3be08b087b':
  Flush package restriction changes for a user.
 2016-03-17 18:55:04 +00:00
Roozbeh Pournader
c1e4cb1da4 Merge "Clean up BoringLayout#isBoring() a little" into nyc-dev am: 886ad06 
am: fcf4352

* commit 'fcf435294c0eb9bdb0946bf5a44465eaa68d3ae4':
  Clean up BoringLayout#isBoring() a little
 2016-03-17 18:55:03 +00:00
Makoto Onuki
5031e5f97a Merge "Add "pm set-home-activity"" into nyc-dev am: 1b21124 
am: e10a984

* commit 'e10a984bab7667c4780cd952c684ecd915303e5c':
  Add "pm set-home-activity"
 2016-03-17 18:54:46 +00:00
Eino-Ville Talvala
3a12f7e4cd Merge "Adjust graphics dataspace references to new standard" into nyc-dev am: 61adad8 
am: eff923b

* commit 'eff923b3f75692bebe84825985203da277a540c7':
  Adjust graphics dataspace references to new standard
 2016-03-17 18:54:43 +00:00
destradaa
dd15c1e553 Merge "Update ContextHubManager\'s System APIs." into nyc-dev am: 5e19f91 
am: 3df5814

* commit '3df581491088d567da9e8be5ee499b6754db9127':
  Update ContextHubManager's System APIs.
 2016-03-17 18:54:39 +00:00