Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android: Enable views to be nested within <Text> #23195

Closed
wants to merge 7 commits into from
+672 −133
Closed

Android: Enable views to be nested within <Text> #23195

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b6c65e4
Android: Enable views to be nested within <Text>
Jul 6, 2016
c73fb84
Update copyright header for added files
Feb 14, 2019
9e72eca
Run prettier on Android TextExample
Feb 14, 2019
37eeca0
Add TODO comment for bug shergin spotted
Feb 20, 2019
81688bd
Revert inline view example
Feb 20, 2019
c5e8473
Need to handle TintContextWrapper now that ReactTextView inherits fro…
Feb 21, 2019
1f67bb5
Move to AndroidX TintContextWrapper
Apr 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update copyright header for added files
Adam Comella committed Apr 1, 2019
commit c73fb843092c4411c457212c33896ed953fe43e3
8 changes: 3 additions & 5 deletions ReactAndroid/src/main/java/com/facebook/react/uimanager/IViewManagerWithChildren.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
/**
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

package com.facebook.react.uimanager;
8 changes: 3 additions & 5 deletions ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeKind.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
/**
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

package com.facebook.react.uimanager;
8 changes: 3 additions & 5 deletions ReactAndroid/src/main/java/com/facebook/react/views/text/TextInlineViewPlaceholderSpan.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
/**
* Copyright (c) 2015-present, Facebook, Inc.
* All rights reserved.
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

package com.facebook.react.views.text;