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

139484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
e7eb35c61d am 2c7fefe3: am f5135c28: Merge "docs: Material design doc fixes from editorial review." into klp-modular-dev 
* commit '2c7fefe339ffa411bcbf759b81f38c5d86cfbfc2':
  docs: Material design doc fixes from editorial review.
 2014-06-17 01:30:38 +00:00
Robert Ly
385d98efb2 am 605b00b9: am 13bc25bf: Merge "docs: misc l-prev fixes" into klp-modular-dev 
* commit '605b00b97f5746efb6c1d2397bc0666f84aa9d25':
  docs: misc l-prev fixes
 2014-06-17 01:29:29 +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
2c7fefe339 am f5135c28: Merge "docs: Material design doc fixes from editorial review." into klp-modular-dev 
* commit 'f5135c283f1771ab0e1de66cb015a0abeb48eae2':
  docs: Material design doc fixes from editorial review.
 2014-06-16 22:55:46 +00:00
Robert Ly
605b00b97f am 13bc25bf: Merge "docs: misc l-prev fixes" into klp-modular-dev 
* commit '13bc25bf4c5b47183b8eda68099314dd2a6ec47b':
  docs: misc l-prev fixes
 2014-06-16 22:32:46 +00: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
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
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
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
Tenghui Zhu
386caf6c8f Merge "update parameters in uploadToTexture() for GLES20" 2014-06-16 15:49:03 +00: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
RoboErik
6b1bea0903 b/15676582 Fix ordering of sessions returned by MediaSessionManager 
This was causing the wrong rcc to be shown. Simple fix
just fixes the ordering so it's not reversed.

Change-Id: I56f2d9d6895d6ba3b0eca8f77a3b0b63e0193ad1
 2014-06-16 16:59:37 -07:00
Selim Cinek
b688bf7ceb Fixed a bug where the device could not be unlocked. 
When the Notifications could be scrolled, the shade could not
be closed.

Bug: 15643474
Change-Id: I59b9f55c0290da7683ce7fd40effc4b5413e4267
 2014-06-16 16:36:51 -07: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
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
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
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
Colin Cross
cb634bda7b Merge "clean up native com.android.internal.os.Zygote" 2014-06-16 15:34:52 +00:00
Colin Cross
18cd9f5762 clean up native com.android.internal.os.Zygote 
This is never compiled for the host any more, so remove all the
unnecesarry ifdefs.

Change-Id: I757e6d604b7f41476ac1021f5bdbc777eac6f99e
 2014-06-16 12:22:56 -07:00
Michael Kolb
a730881d76 Merge "DO NOT MERGE : Fix measuring with outset for orientation" into klp-modular-dev 2014-06-16 15:34:28 +00:00
Michael Kolb
ee028d502e DO NOT MERGE : Fix measuring with outset for orientation 
Bug: 14992865

Change-Id: Ie133d8010a394403e52512f4012632389bc32c4a
 2014-06-16 20:28:52 +00:00
Narayan Kamath
5d140e4b1b am 5406f59a: am 6a6411e3: am 076dc013: Merge "Move dex file pruning to installd." 
* commit '5406f59abd0cde826e8254fe628bea6d80769c8c':
  Move dex file pruning to installd.
 2014-06-16 13:58:39 +00:00
Narayan Kamath
5406f59abd am 6a6411e3: am 076dc013: Merge "Move dex file pruning to installd." 
* commit '6a6411e3d8c533a40bfe1897e2c26e3d6f3b52e0':
  Move dex file pruning to installd.
 2014-06-16 13:54:10 +00:00
Narayan Kamath
6a6411e3d8 am 076dc013: Merge "Move dex file pruning to installd." 
* commit '076dc0135b153cbcedbe584645c93cfe4390cdb0':
  Move dex file pruning to installd.
 2014-06-16 13:50:37 +00:00
Narayan Kamath
97df96d8eb am 2ecc4dc8: am f36fe3f8: am 1083573c: Merge "Track changes to libcore ICU apis." 
* commit '2ecc4dc88fc209f75f5dfe815d6a1fbb5fd49ef2':
  Track changes to libcore ICU apis.
 2014-06-16 11:10:00 +00:00
Narayan Kamath
2ecc4dc88f am f36fe3f8: am 1083573c: Merge "Track changes to libcore ICU apis." 
* commit 'f36fe3f85daaf9e3b3270143d6648394768bb324':
  Track changes to libcore ICU apis.
 2014-06-16 11:01:29 +00:00
Narayan Kamath
f36fe3f85d am 1083573c: Merge "Track changes to libcore ICU apis." 
* commit '1083573c2feb6677ae5627a9ee41f82a697e22d4':
  Track changes to libcore ICU apis.
 2014-06-16 10:56:34 +00:00
Robert Ly
617a4c403f am 2b49f5b5: am d3843038: Merge "docs: Fixing the remaining issues with the Auto page" into klp-modular-dev 
* commit '2b49f5b5fa878a87871c7cc1e12c5f9bf816944c':
  docs: Fixing the remaining issues with the Auto page
 2014-06-16 10:11:50 +00:00
Joe Fernandez
7c820b4995 am 05b55aff: am b83765ff: Android TV Dev Guide for L-Prevew, round 2 
* commit '05b55afff4864d88489b1bd65b903b8e73d8c000':
  Android TV Dev Guide for L-Prevew, round 2
 2014-06-16 10:11:45 +00:00
Robert Ly
2b49f5b5fa am d3843038: Merge "docs: Fixing the remaining issues with the Auto page" into klp-modular-dev 
* commit 'd3843038b93e91681a6f40633efeca8b41edc055':
  docs: Fixing the remaining issues with the Auto page
 2014-06-16 10:07:04 +00:00
Joe Fernandez
05b55afff4 am b83765ff: Android TV Dev Guide for L-Prevew, round 2 
* commit 'b83765ff06afbc96f4ffc21f9350ef6650d70d94':
  Android TV Dev Guide for L-Prevew, round 2
 2014-06-16 10:06:57 +00:00