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

137815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
dd46bfd095 am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '02d88f7b350e166da3b1f480c912351a5c72d00c':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:39:08 +00:00
Glenn Kasten
6dd6a3dfa0 Merge "Update android.media.AudioTrack.getTimestamp API documentation" 2014-06-03 20:38:08 +00:00
Deepanshu Gupta
ab869de19e am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'cd192c0b1ca56af3ed3dfdb38626304de0412254':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:36:41 +00:00
Deepanshu Gupta
47da909503 am 4f69d5b8: (-s ours) am 8af310c0: am 8f6a9a65: am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '4f69d5b8e976751e9dd0ff2c8bf1b385f06435c4':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:36:40 +00:00
Deepanshu Gupta
236b71649c am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '0ab0d875d46d6d8974c9cf3ea5856dcfb557e9a4':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:35:12 +00:00
Adam Lesinski
522c5ce280 am 7e547e0d: Merge "Add --pseudo-localize option to generate resources for pseudolocales." 
* commit '7e547e0d72817032737909952f00acc2e777a35a':
  Add --pseudo-localize option to generate resources for pseudolocales.
 2014-06-03 20:35:11 +00:00
Deepanshu Gupta
02d88f7b35 am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit 'ffbf24476c153bbd9293261cc14d9648f72b7369':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:35:09 +00:00
Deepanshu Gupta
7e0b1d5901 am d056218b: am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'd056218b0486676f8e3b68854f94e2d36209ea18':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:35:02 +00:00
destradaa
919902a0de Merge "Re-work the initialization of FLP HAL to make isSupported() static. b/14839888" 2014-06-03 20:34:11 +00:00
Deepanshu Gupta
4f69d5b8e9 am 8af310c0: am 8f6a9a65: am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '8af310c0c6a0922d2a84600f9abf7877009d12ba':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:32:57 +00:00
Deepanshu Gupta
cd192c0b1c am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '704954c96a797e45d421b8d910ca2426d19f6b37':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:32:55 +00:00
Deepanshu Gupta
d056218b04 am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '661e158b0a754f1123485673ac050e388e8056a2':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:30:57 +00:00
Deepanshu Gupta
0ab0d875d4 am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '28f550f010045d5df9e7762a567fb0351499b846':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:30:53 +00:00
Deepanshu Gupta
ffbf24476c am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '083af20d9dc0d14eadd2ba03951579f88cd1f671':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:30:50 +00:00
Deepanshu Gupta
8af310c0c6 am 8f6a9a65: am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '8f6a9a658a8a06eb4f11cfff5dca7edf3c7462ad':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:29:01 +00:00
Deepanshu Gupta
704954c96a am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '5f56ea8d802b3a7ce5ba8992a84dd3b462676e0e':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:28:48 +00:00
Deepanshu Gupta
661e158b0a am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '2ac96a093b12883c44327edba899e6c79ee71a7b':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:27:08 +00:00
Deepanshu Gupta
28f550f010 am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '03a832669ded18a99d4ac37f047a82d2b198302a':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:25:51 +00:00
Deepanshu Gupta
083af20d9d am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '531bdb5b57a7a903cea16baedb914e34df941651':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:25:48 +00:00
Deepanshu Gupta
5f56ea8d80 am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'f48ab8feec71419e574a2d2f08a29be87743ef07':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:24:25 +00:00
Deepanshu Gupta
8f6a9a658a am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '8974a5e6d8408b4cd93f1befb05cc9b654b71e4a':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:23:30 +00:00
Deepanshu Gupta
2ac96a093b am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'a0fc1f46264e316449402525fbeb033138ec5f49':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:21:20 +00:00
Deepanshu Gupta
03a832669d am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '08d2007b33838570a96c8df890f0757fa920904c':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:21:12 +00:00
Deepanshu Gupta
f48ab8feec am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '3b7c09b4336f421c489523c10278ecfbfb0708a7':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:21:10 +00:00
Deepanshu Gupta
531bdb5b57 am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit 'fe6f30491f8506a4b2ad895a0f3e68de180e4243':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:21:08 +00:00
Jean-Michel Trivi
39f5300ebc Merge "AudioFormat class" 2014-06-03 20:17:38 +00:00
Adam Lesinski
7e547e0d72 Merge "Add --pseudo-localize option to generate resources for pseudolocales." 2014-06-03 20:11:13 +00:00
Tim Murray
f0c62b2676 Add support for mixed 32/64 APKs using RenderScript. 
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
 2014-06-03 12:30:53 -07:00
Igor Viarheichyk
a191d0464f Add --pseudo-localize option to generate resources for pseudolocales. 
Update help output with new option, remove mention of obsolete zz_ZZ
pseudolocale.

Change-Id: Ie2cfc8d11ef6a57e2b9a2333514a7340a3a8c075
 2014-06-03 12:07:50 -07:00
Andrew Solovay
4af26e7c98 am 50cf4a6a: am aaaa7769: am 9dc2412d: am 47ede834: docs: Fixed alphabetization on Play Store icons page. 
* commit '50cf4a6a3045cd3ffe0a6b51351c53c5b611ca33':
  docs: Fixed alphabetization on Play Store icons page.
 2014-06-03 18:14:06 +00:00
Michael Kolb
9a7a805124 am a4f593d7: am 576a0d14: Merge "Fix circular mask" into klp-modular-dev 
* commit 'a4f593d7fb205b56412e3091fb21c592abe934cf':
  Fix circular mask
 2014-06-03 18:14:00 +00:00
destradaa
5ce66d8dcc Re-work the initialization of FLP HAL to make isSupported() static. 
b/14839888

Change-Id: Ib5973586fd8a2d4a1e5fd09cf82dd4f4493398d0
 2014-06-03 11:09:00 -07:00
ztenghui
a8cb975aa7 Merge "Handle the alpha in the group setting and fix the fill issue." 2014-06-03 18:07:31 +00:00
Andrew Solovay
50cf4a6a30 am aaaa7769: am 9dc2412d: am 47ede834: docs: Fixed alphabetization on Play Store icons page. 
* commit 'aaaa7769139fd1ef683a445c76414f6dcfe07d3b':
  docs: Fixed alphabetization on Play Store icons page.
 2014-06-03 18:06:56 +00:00
Michael Kolb
a4f593d7fb am 576a0d14: Merge "Fix circular mask" into klp-modular-dev 
* commit '576a0d14e19dae9fa6aa50e0bb836a1da793ef21':
  Fix circular mask
 2014-06-03 18:06:25 +00:00
ztenghui
2af745b56c Handle the alpha in the group setting and fix the fill issue. 
The fill used to be dafault as "none".
Now it is default to opaque black, which is consistent with svg now.
So it is better to always set the fill value.

bug:15288554

Change-Id: I07ac41c5adc77665e66e52f2c0220139586fb09b
 2014-06-03 10:54:14 -07:00
Andrew Solovay
aaaa776913 am 9dc2412d: am 47ede834: docs: Fixed alphabetization on Play Store icons page. 
* commit '9dc2412dfcaa4d5c77ea892c3c1d3d6ea59597dd':
  docs: Fixed alphabetization on Play Store icons page.
 2014-06-03 17:42:05 +00:00
Yuhao Zheng
b656270e8e Merge "Add class CellularNetwork for plmn parsing and retrieve mcc and mnc." 2014-06-03 17:41:23 +00:00
Andrew Solovay
9dc2412dfc am 47ede834: docs: Fixed alphabetization on Play Store icons page. 
* commit '47ede8340b8bd4e5e5c500ddf84b3510dd12c1a0':
  docs: Fixed alphabetization on Play Store icons page.
 2014-06-03 17:38:04 +00:00
Jae Seo
2e0bacc2a3 am 594ac157: Merge "TvContract: Address the feedback from the API review" into lmp-preview-dev 
* commit '594ac1575f8301023d37c329f8c676ba9bda396c':
  TvContract: Address the feedback from the API review
 2014-06-03 17:17:00 +00:00
Sungsoo Lim
8d2d5c8d5c am 61e4b1cf: Merge "Add ClientState for handling the crash of clients." into lmp-preview-dev 
* commit '61e4b1cf302ea659329952dfcebffb2f387bff3f':
  Add ClientState for handling the crash of clients.
 2014-06-03 17:16:49 +00:00
Alan Viverette
19212f4a86 am 23416c06: Fix build 
* commit '23416c06c4cb2dba437c4ef749857e085bc76d18':
  Fix build
 2014-06-03 17:16:43 +00:00
Chulwoo Lee
f573765bf1 am b9c0a8ae: Merge "Add a way to get the class name of SetupActivity and SettingsActivity" into lmp-preview-dev 
* commit 'b9c0a8ae7b0e69829a663fa2ca6bbdededa02d93':
  Add a way to get the class name of SetupActivity and SettingsActivity
 2014-06-03 17:16:33 +00:00
Alan Viverette
02a078d088 am 25931ade: Merge "Clean up drawable theming APIs" into lmp-preview-dev 
* commit '25931adee5ba954220190f48901bb66c8c9dd462':
  Clean up drawable theming APIs
 2014-06-03 17:16:27 +00:00
Dianne Hackborn
bcaffd0586 am da4a186f: Merge "Some battery stats history fixes." into lmp-preview-dev 
* commit 'da4a186f8bf49d8ea06d5ad6d402d9b073ee3841':
  Some battery stats history fixes.
 2014-06-03 17:16:01 +00:00
Raph Levien
690d45157d am faa91203: Merge "Support fallbacks for custom typefaces (Minikin)" into lmp-preview-dev 
* commit 'faa912037ca4895eb99155a4a53354435ee413c2':
  Support fallbacks for custom typefaces (Minikin)
 2014-06-03 17:15:56 +00:00
George Mount
d7954a8a29 am 5a745332: Merge "Delay sending shared element position until after layout." into lmp-preview-dev 
* commit '5a745332b3e5bac89052484e2ae4978a9a1e1bcd':
  Delay sending shared element position until after layout.
 2014-06-03 17:15:47 +00:00
Adam Powell
a5dd05f26f am ef7c0948: Merge "Add an internal method for setting optical insets." into lmp-preview-dev 
* commit 'ef7c0948ea1379ee9f3f5f40267ca2cf5e76a36b':
  Add an internal method for setting optical insets.
 2014-06-03 17:15:34 +00:00
Jorim Jaggi
0db9a678a4 am a0437d35: Merge "Hide header when notifications collide with it on Keyguard." into lmp-preview-dev 
* commit 'a0437d355a853adb5023ab0885952620d0cf4f07':
  Hide header when notifications collide with it on Keyguard.
 2014-06-03 17:15:26 +00:00
Raph Levien
1044046aa9 am 8e3605e4: Merge "Check for NULL on TypefaceImpl unref" into lmp-preview-dev 
* commit '8e3605e4de5a109792acca22c37976ac52ee571e':
  Check for NULL on TypefaceImpl unref
 2014-06-03 17:15:21 +00:00