summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix "find: `dummy': No such file or directory"HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ycm-13.0Daniel Sikorski2016-03-209-9/+9
| | | | | | thanks @carliv Change-Id: I10d02c520af0cae344bb94031fa3bf2fa315a947
* v4: Assign mDrawable before calling setBoundsstable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kd34d2016-03-171-6/+1
| | | | | | | | | | In setWrappedDrawable, mDrawable is set to null which can cause an NPE when onBoundsChange is called. This happens when setBounds is called before mDrawable has been reassigned to the new drawable to wrap. Change-Id: I0cdd7c68c6f1156b5429cb9731ce1e25928be9d9 TICKET: CYNGNOS-2250
* Merge tag 'android-6.0.1_r22' of ↵staging/cm-13.0+r22Steve Kondik2016-03-101018-9428/+43827
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/support into cm-13.0 Android 6.0.1 release 22 Change-Id: I032842dcd2a5a216a56a47a7cb109f0cee8ac251
| * Avoid absolute path loading .so after M am: 405f6d6e7c am: 5ab545784dYang Ni2016-01-152-8/+11
| |\ | | | | | | | | | | | | | | | | | | am: 4c2f5b63e9 * commit '4c2f5b63e935777645bb819b5e261ad5dda1796d': Avoid absolute path loading .so after M
| | * Avoid absolute path loading .so after M am: 405f6d6e7cYang Ni2016-01-152-8/+11
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | am: 5ab545784d * commit '5ab545784d96d5fa2c6fb9304dda04c2593778ce': Avoid absolute path loading .so after M
| | | * Avoid absolute path loading .so after MYang Ni2016-01-152-8/+11
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 405f6d6e7c * commit '405f6d6e7c2f21aca8f4dfe7bbe42a8767690aac': Avoid absolute path loading .so after M
| | | | * Avoid absolute path loading .so after MYang Ni2016-01-152-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 26548955 Some apps have unpacked APKs, e.g., Google Camera. Using absolute path for shared libraries provided by the app will prevent them from loading. Fixed this by limiting usage of the absolute path to API levels older than M. Updated the bug number comment in the code so that they are clickable. Bumped the SDK level to 23 for RenderScript support lib build, so that we can use the proper API level constant defined in android.os.Build.VERSION_CODES. Change-Id: I9b6d9efed380e3e077e1efeabea324d4c01a7f0b (cherry picked from commit e214512fee6106909d3c6de59d28c307d71236c1)
| * | | | Merge "Import translations. DO NOT MERGE" into cw-e-devGeoff Mendal2015-12-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8a33045cc3 -s ours * commit '8a33045cc35cfbf2c0ad9bd718f55c47bc5236e5': Import translations. DO NOT MERGE
| | * | | Merge "Import translations. DO NOT MERGE" into cw-e-devGeoff Mendal2015-12-161-1/+1
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEGeoff Mendal2015-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d8701b42d043b56094c5370a90c9e17cab72991 Auto-generated-cl: translation import
| * | | | | Merge "Import translations. DO NOT MERGE" into cw-e-devGeoff Mendal2015-12-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d5f25c9919 -s ours * commit 'd5f25c99197c3e8fa9adb6e84f451f70f40e8035': Import translations. DO NOT MERGE
| | * | | | Merge "Import translations. DO NOT MERGE" into cw-e-devGeoff Mendal2015-12-161-1/+1
| | |\ \ \ \
| | | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-151-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3f0ca2c8e0f21aee0d312f5778562c1544715804 Auto-generated-cl: translation import
| * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 08e1bcc2a1 -s ours * commit '08e1bcc2a185b646574b7eaf8396fcb07047370a': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-151-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ida19a94b7369b23599d856ffce66193c3a3d2c0e Auto-generated-cl: translation import
| * | | | [RenderScript] Load from the full path of librsjni and libRSSupport. am: ↵Miao Wang2015-11-213-33/+75
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa35ba536c am: 2e2e7fb23a am: bac4635b8f * commit 'bac4635b8f965f9ab34bbf497d1cc3a2a7c2dbcc': [RenderScript] Load from the full path of librsjni and libRSSupport.
| | * | | [RenderScript] Load from the full path of librsjni and libRSSupport. am: ↵Miao Wang2015-11-213-33/+75
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa35ba536c am: 2e2e7fb23a * commit '2e2e7fb23ae9be56e2c8d17eac3295e99fe61adf': [RenderScript] Load from the full path of librsjni and libRSSupport.
| | | * | [RenderScript] Load from the full path of librsjni and libRSSupport.Miao Wang2015-11-203-33/+75
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: aa35ba536c * commit 'aa35ba536c6fec729b2efab8223922890ce59c26': [RenderScript] Load from the full path of librsjni and libRSSupport.
| | | | * [RenderScript] Load from the full path of librsjni and libRSSupport.Miao Wang2015-11-123-33/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - For API 9+ load from the full path of librsjni, libRSSupport. - Enable logging of critical error. - Log the version of both JAVA and JNI. Bug: 25226912 Change-Id: I357398634ec3bfd70c71e005241c5a66650bdba6 (cherry picked from commit 8b03eca305a4019ef712afa3a8deb1d348463e70)
| * | | | Merge "Reset SwipeRefreshLayout on window detaches." into mnc-ub-devAurimas Liutikas2015-11-201-11/+23
| |\ \ \ \
| | * | | | Reset SwipeRefreshLayout on window detaches.Aurimas Liutikas2015-11-191-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug when SwipeRefreshLayout gets detached when scale down animation is still playing causing onAnimationEnd to never get called. Bug: 21515801 Change-Id: Ieece09f8900fa47c14b81229490f047a55e156ba
| * | | | | MediaRouter: Make getThemeColor() work properlySungsoo Lim2015-11-205-26/+50
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an app uses its own style for MRCD, the primary color in the style was not applied properly when creating theme context in the constructor of MRCD. Bug: 25731047 Change-Id: I9744c76373ac9b3d400f7be753a589aa520c78e6
| * | | | Merge "Initial proof-of-concept pass for TextViewCompat host testing." into ↵Kirill Grouchnikov2015-11-195-0/+193
| |\ \ \ \ | | | | | | | | | | | | | | | | | | mnc-ub-dev
| | * | | | Initial proof-of-concept pass for TextViewCompat host testing.Kirill Grouchnikov2015-11-195-0/+193
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c194dac02ec24b0e5f77caa78461713324a4baa
| * | | | | Merge "Don't mutate StateListDrawables on API 7" into mnc-ub-devChris Banes2015-11-191-5/+4
| |\ \ \ \ \
| | * | | | | Don't mutate StateListDrawables on API 7Chris Banes2015-11-191-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 25787417 Change-Id: I6376d0f96cd429d1bfe77b104d91461baed49645
| * | | | | | Merge "Copy over the wrapped drawable's bounds in wrap()" into mnc-ub-devChris Banes2015-11-192-4/+15
| |\ \ \ \ \ \
| | * | | | | | Copy over the wrapped drawable's bounds in wrap()Chris Banes2015-11-182-4/+15
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also ensure that we don't have multi-nested drawable wrappers on L+, there is no need for them. BUG: 25488702 Change-Id: I6b2d2a8f03abfad7fafd5e0eb4f77349b4f2c381
| * | | | | | Merge "Don't animate TIL error if we've been given the same error" into ↵Chris Banes2015-11-191-13/+26
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | mnc-ub-dev
| | * | | | | Don't animate TIL error if we've been given the same errorChris Banes2015-11-191-13/+26
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | BUG: 25781224 Change-Id: I6b507dd0ec993280cfc7aa19741cc51129f13acd
| * | | | | Merge "Make sure we keep Annotations in design's proguard" into mnc-ub-devChris Banes2015-11-181-0/+3
| |\ \ \ \ \
| | * | | | | Make sure we keep Annotations in design's proguardChris Banes2015-11-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 24861467 Change-Id: I8ea08f16d3f2422c3b61fab93357806864b2d23e
| * | | | | | Merge "GuidedStep: sync selectorView translationY to focused view" into ↵Dake Gu2015-11-1810-201/+125
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | mnc-ub-dev
| | * | | | | | GuidedStep: sync selectorView translationY to focused viewDake Gu2015-11-1810-201/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current implementation assumes the focused view stays at fixed Y location. This is no longer true for expanded actions. This CL added support to sync selectorView Y position to focused view Y position. And due to the conflicts of both IME and scroll changes selector Y position, added common parent for change Y position for IME. Simplified selectorView animation implementation. Fixed bug that FadeAndShortSlide resets transitionY to 0. Fixed a mismatch of transitionName for guidedactions_root2. Remove unnecessary transition excludes since the views are already part of shared element transition. Tested by changing alignment rule of VerticalGridView. Change-Id: Id9f676e607aa6e3e9fed14e5b2687e4ad0951f45
| * | | | | | | Fix a constructor of ForegroundLinearLayoutYuichi Araki2015-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This view is not externally visible, and this constructor is not currently used, but it is better to get it right. Change-Id: Ia06a021286f34a25f8af1b7dc667e3078f1f06a4
| * | | | | | | Merge "MediaRouter: Fix for background colors of group volume controls" into ↵Sungsoo Lim2015-11-181-2/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | mnc-ub-dev
| | * | | | | | MediaRouter: Fix for background colors of group volume controlsSungsoo Lim2015-11-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 25732176 Change-Id: I3b3265778894ce9c397829fea714c08fc3da7a23
| * | | | | | | Merge "Prevent infinite loop in case of integer overflow." into mnc-ub-devDeepanshu Gupta2015-11-171-1/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Prevent infinite loop in case of integer overflow.Deepanshu Gupta2015-10-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b.android.com/191328 Change-Id: Ibcf3cbaea8a486887066111891fe8a9b84d13268
| * | | | | | | | Merge changes I05f4ebc0,I53e63fe0 into mnc-ub-devDake Gu2015-11-1716-68/+47
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Theme dark version of brand color and guided actions background GuidedStepFragment: fix temporary black screen in activity enter
| | * | | | | | | Theme dark version of brand color and guided actions backgroundDake Gu2015-11-1614-66/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the same strategy for defaultBrandColor/colorPrimary, introduce defaultBrandColorDark/colorPrimaryDark for details action background. Remove the code that auto-calculate dark version from defaultBrandColor. Simplify HeadersFragment and FullWidthdetailsOverviewRowPresenter code by using theme attribute in layout file. Follow the same naming convension, renamed guidedButtonActionsBackground to guidedActionsBackgroundDark for the "dark" version. Change-Id: I05f4ebc0903a3e10b860777c4eb44c4ac5547c9a
| | * | | | | | | GuidedStepFragment: fix temporary black screen in activity enterDake Gu2015-11-133-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Last CL deprecating background view causes the regression. We need to keep the activity translucent during fade-in background view of GuidedStepFragment. The trick is to actually set a transparent ColorDrawable and make it last as long as the background view fade-in. Change-Id: I53e63fe0cebf60028dc8f45dc3446407ad7a5ef0
| * | | | | | | | Merge "AppBarLayout fixes" into mnc-ub-devChris Banes2015-11-172-11/+38
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | AppBarLayout fixesChris Banes2015-11-172-11/+38
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make sure we honor snap after a manual drag (rather than a nested scroll). - Support exitUntilCollapsed|enterAlways correctly - Ensure the offset is constrained on size change BUG: 25707376 BUG: 25680933 BUG: 25681811 Change-Id: Idfa3ed32e42890725e4ee59236fa84a705d433d4
| * | | | | | | Merge "MediaRouter: Make volume sliders move smoothly" into mnc-ub-devSungsoo Lim2015-11-171-58/+30
| |\ \ \ \ \ \ \
| | * | | | | | | MediaRouter: Make volume sliders move smoothlySungsoo Lim2015-11-171-58/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Do not set the progress of the volume slider if the volume change happens because of user actions. - Increase the delay to avoid inconsistent callback sequence. Bug: 24886804, Bug: 25435990 Change-Id: I35149198b39371fc6d7514e526284282db123f54
| * | | | | | | | Merge "Add elevation to leanback list dialogs" into mnc-ub-devTony Mantler2015-11-161-0/+2
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Add elevation to leanback list dialogsTony Mantler2015-11-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To match elevation on the leanback prefs layouts. Change-Id: Ib54294b72504d7c15ffcd51fe2633606a6db210f
| * | | | | | | | Merge "Make sure we honor canChildScrollUp()" into mnc-ub-devChris Banes2015-11-161-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Make sure we honor canChildScrollUp()Chris Banes2015-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the new nested scrolling flow we weren't checking the callback. This CL adds it. BUG: 25680804 Change-Id: I23cee7dde06b239195d02cd7ae7ab443b8769c36
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 12:02:54 +0000