drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
139,553 Commits 1 Branch 0 Tags
Commit Graph

139553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
0d28bb47d7 Merge "Fix the texture ID reuse issue in HWUI." 2014-06-16 22:13:20 +00:00
Chris Craik
5e7ef9489f Merge "hwui: fix possible null pointer de-refrence" 2014-06-16 22:13:20 +00:00
smain@google.com
b17420b81e Merge "add toggle for IDE instructions, revise some titles and other cleanup to Google API setup" into klp-modular-dev 2014-06-16 22:12:26 +00:00
smain@google.com
7332669e39 add toggle for IDE instructions, revise some titles and other cleanup to Google API setup 
Change-Id: Ic2454824adddb80ac844939f165cc68fc52a7005
 2014-06-16 20:12:30 -07:00
Robert Ly
f5135c283f Merge "docs: Material design doc fixes from editorial review." into klp-modular-dev 2014-06-16 22:12:26 +00:00
Ricardo Cervera
d9a70a7aaa docs: Material design doc fixes from editorial review. 
Change-Id: I2a7a9d39e85cc9c9d5f19f7265aaa6dc8c5dba12
 2014-06-16 15:43:22 -07:00
Michael Kolb
b936c57c2c am a730881d: Merge "DO NOT MERGE : Fix measuring with outset for orientation" into klp-modular-dev 
* commit 'a730881d769cfe0bdce1faafae2c3b88f86d6978':
  DO NOT MERGE : Fix measuring with outset for orientation
 2014-06-16 20:55:39 +00:00
Chris Craik
56a78265bf Merge "Adjust tessellation abort depth DO NOT MERGE" into lmp-preview-dev 2014-06-16 20:54:41 +00:00
Chris Craik
2743e0caad Adjust tessellation abort depth DO NOT MERGE 
bug:15615144
Change-Id: Iee91f241067de9d088220c34c19db52a37ac258d
 2014-06-16 14:00:40 -07:00
Colin Cross
289476b65b am a803542a: am cb634bda: Merge "clean up native com.android.internal.os.Zygote" 
* commit 'a803542aad4a58fe2446b8bf9cc4a4f59942d084':
  clean up native com.android.internal.os.Zygote
 2014-06-16 20:19:05 +00:00
Colin Cross
a803542aad am cb634bda: Merge "clean up native com.android.internal.os.Zygote" 
* commit 'cb634bda7b0130015509b0e4d236d10b20b2340d':
  clean up native com.android.internal.os.Zygote
 2014-06-16 20:14:40 +00:00
Elliott Hughes
7285b38e0b Merge "@hide." into lmp-preview-dev 2014-06-16 19:03:13 +00:00
Elliott Hughes
f9fd6a7dfc @hide. 
Change-Id: Ieacf34a7b850910e70ae54f738608509e2c39e2e
 2014-06-16 20:15:44 +00:00
Tenghui Zhu
ecae1ffd77 am df36dd20: am 386caf6c: Merge "update parameters in uploadToTexture() for GLES20" 
* commit 'df36dd200c55a6ad463b46bab0ffff49d21206ff':
  update parameters in uploadToTexture() for GLES20
 2014-06-16 17:18:51 +00:00
Tenghui Zhu
df36dd200c am 386caf6c: Merge "update parameters in uploadToTexture() for GLES20" 
* commit '386caf6c8f276f1d03ea077bc799df2a937ef500':
  update parameters in uploadToTexture() for GLES20
 2014-06-16 17:13:53 +00:00
Baligh Uddin
d5d8b88873 Import translations. DO NOT MERGE 
Change-Id: I77aefc3b2ea919ca7e667fc55b43badb2c43ddbf
Auto-generated-cl: translation import
 2014-06-16 10:12:38 -07:00
Baligh Uddin
35c18d9fc9 Import translations. DO NOT MERGE 
Change-Id: Ic6b3eb6f14875072b5fbce1db22aacbf3027044e
Auto-generated-cl: translation import
 2014-06-16 10:10:26 -07:00
Baligh Uddin
1e40894890 Import translations. DO NOT MERGE 
Change-Id: I0c9e89ee6bd378aae49c1406f0fe5322fbbe24d4
Auto-generated-cl: translation import
 2014-06-16 10:02:13 -07:00
Tim Murray
8197cc403a am 080671c5: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
* commit '080671c5383f4b98303c143a685b9f5e75cfe781':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-06-16 17:01:29 +00:00
Tim Murray
080671c538 DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
 2014-06-16 09:55:50 -07:00
Baligh Uddin
994599f97c Import translations. DO NOT MERGE 
Change-Id: Ib6cf3952a1b349f06e1be32c5ab9524de0836b83
Auto-generated-cl: translation import
 2014-06-16 09:36:54 -07:00
Tenghui Zhu
386caf6c8f Merge "update parameters in uploadToTexture() for GLES20" 2014-06-16 15:49:03 +00:00
Winson Chung
6df613b4cd Merge "Tweaking enter/scrim animations/styles. Fixing issue with clipping not saving layers." 2014-06-16 15:46:16 +00:00
Winson Chung
969f586533 Tweaking enter/scrim animations/styles. Fixing issue with clipping not saving layers. 
Change-Id: I476c68d7df4a8fc59ca3d9be3f99526089183ec2
 2014-06-16 19:11:29 -07:00
Robert Ly
5562c6d3cd am f141f48f: am 483af3bf: docs: fix lmp index 
* commit 'f141f48fb47f67fb0b93415b47a80fd99b55e723':
  docs: fix lmp index
 2014-06-17 01:46:59 +00:00
Adam Lesinski
e75b2c2677 Fix runtime overlay tests 
The runtime overlay tests were crafting bad locales.

Change-Id: I33c87e71752756f40a954db9f01ea3cdde488a42
 2014-06-17 01:22:57 +00:00
Selim Cinek
4e456bee15 Fixed that the top card casts a shadow on the second 
Bug: 15531609
Bug: 15381356
Change-Id: I0a85e43ac9c4330349fa46b3f00f7c0cf231520f
 2014-06-17 00:46:16 +00:00
Robert Ly
208eb3e84a Merge "Android TV DevGuide home fix (no pic)" into klp-modular-dev 2014-06-16 15:46:16 +00:00
Joe Fernandez
38ed6b7b77 Android TV DevGuide home fix (no pic) 
Change-Id: If48d6c6d2973c2d4bcf97da503cb707144f33028
 2014-06-16 16:05:43 -07:00
Robert Ly
13bc25bf4c Merge "docs: misc l-prev fixes" into klp-modular-dev 2014-06-16 15:46:16 +00:00
Robert Ly
d82b45c1a4 docs: misc l-prev fixes 
Change-Id: I9e2e82d926ba81c8621b24aa10247e1231bb2b2d
 2014-06-16 15:26:20 -07:00
Fabrice Di Meglio
6b2df21eca Merge "Fix SeekBarPreference Theming" 2014-06-16 15:46:16 +00:00
RoboErik
2fc02ba031 am 276777ea: b/15676582 Fix ordering of sessions returned by MediaSessionManager 
* commit '276777ea10dadd27cd9fad5260e41dfed6cfa34a':
  b/15676582 Fix ordering of sessions returned by MediaSessionManager
 2014-06-17 00:07:13 +00:00
Fabrice Di Meglio
19ae4ca5a7 Fix SeekBarPreference Theming 
- make the layout a Theme attribute and use it
- make a specific Material version of the layout for matching
what we have in the Settings App

See bug: #15414236 Define a framework theme for system settings

and #15384992 Setting Dashboard - padding updates

Change-Id: I69c90523fab112fecf26d89de8fc35dd62430c06
 2014-06-16 15:58:25 -07:00
Selim Cinek
ea8a3d2510 Merge "Fixed a bug in the scrolling logic" 2014-06-16 22:12:26 +00:00
Selim Cinek
94d46abc76 am 7cf7969c: Fixed a bug where the device could not be unlocked. 
* commit '7cf7969c23caf59b9fd0fccb21e6b3ca3b966823':
  Fixed a bug where the device could not be unlocked.
 2014-06-16 23:47:37 +00:00
Selim Cinek
48e746c3c8 Fixed a bug in the scrolling logic 
When the user overflung to go to the quicksettings panel the
scroll logic remained active and was not reset.

Change-Id: Iab733f3525d5465c5dc583559d0acbc350274171
 2014-06-16 23:06:49 +00:00
Adam Lesinski
2c749d2427 New command to get device config 
Change-Id: I7172a3a150fd83e2382ca3e4e4a0188758189f14
 2014-06-16 23:01:19 +00:00
John Reck
b69fc08303 Merge "Add atlas map pointer validation" 2014-06-16 22:12:26 +00:00
John Reck
b8802b1293 Add atlas map pointer validation 
Bug: 15425820

 This just prevents the crash, it's still unclear how bad pointers
 are getting into the map in the first place

Change-Id: I3acffaae09548ec48973035b7fcf5f35606bad60
 2014-06-16 15:28:50 -07:00
Raph Levien
466cd7a2a6 Merge "Clean up dirFlags / bidiFlags confusion" 2014-06-16 22:12:26 +00:00
Marco Nelissen
1c46ae419c Merge "Don't send unneeded messages." 2014-06-16 21:50:51 +00:00
Raph Levien
051910b9f9 Clean up dirFlags / bidiFlags confusion 
The dirFlags and bidiFlags enums are distinct, and have different
meanings. The former is a determined direction for a run of text, while
the latter is a request for the bidi algorithm. They have been used
interchangeably, and this has caused some problems, notably running the
bidi algorithm needlessly when the direction for a run is already
determined.

This patch cleans up the confusion, by always naming each occurrence
explicitly "boolean isRtl" or "int bidiFlags" (the previous code often
just used "int flags", which added to the confusion), and converts
between the meanings when a function takes an isRtl argument but passes
it to another function expecting bidiFlags.

Fixes b/15089607 Clean up bidi flag mess

Change-Id: I410b6604376e853dd12c255e7f5a9d2b9a310dd9
 2014-06-16 14:36:08 -07:00
Alan Viverette
153976169e Merge "Fix tint filters in NinePatchDrawable and ShapeDrawable" 2014-06-16 15:39:47 +00:00
Alan Viverette
a2992f44bc Fix tint filters in NinePatchDrawable and ShapeDrawable 
BUG: 15678325
Change-Id: I57066e7a44498c88a270c76b7880f36825a25bb8
 2014-06-16 18:34:04 -07:00
Chris Craik
0732ba5756 am 88b1c9ad: am e709d53f: am 0d28bb47: Merge "Fix the texture ID reuse issue in HWUI." 
* commit '88b1c9ad87ca6d6faaf824bff4ee9d3c799362e5':
  Fix the texture ID reuse issue in HWUI.
 2014-06-17 01:31:21 +00:00
Chris Craik
11a8d4f8b9 am 678886fd: am b1fc06a4: am 5e7ef948: Merge "hwui: fix possible null pointer de-refrence" 
* commit '678886fde5cd779de79f8e38479aa6de82f8e755':
  hwui: fix possible null pointer de-refrence
 2014-06-17 01:31:16 +00:00
Tim Murray
658639c6bc am 9dad7d44: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
* commit '9dad7d44d29d27afa802922abc52bfaddb4e83a0':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-06-17 01:30:58 +00:00
Robert Ly
c14f05cb30 am 90fd93c0: am d458e3f4: delete tv 
* commit '90fd93c0ef3d5f694bff8b8e94ccca9b2cb05b84':
  delete tv
 2014-06-17 01:30:52 +00:00
Robert Ly
17df2740aa am 3a437c78: am 208eb3e8: Merge "Android TV DevGuide home fix (no pic)" into klp-modular-dev 
* commit '3a437c784650930b770a9eb2e9a2620e08386725':
  Android TV DevGuide home fix (no pic)
 2014-06-17 01:30:46 +00:00