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

128399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
2accbf904f Revert the revert of adding isRound to WindowInsets after early merge 
This reverts commit 01ebfbd0a0a3a89b563ab6c8c346c669eca39a1a.

Change-Id: I3d5a3523a1505cc3bfd0172c7282a8eda21ae206
 2014-04-16 23:14:57 +00:00
Michael Kolb
01ebfbd0a0 Revert "Add isRound to WindowInsets" 
This reverts commit e5244b5638535964103ca1dfc867442a64243db1.

Change-Id: I6371c718e2189968699e980fd0e7ba91c486aca6
 2014-04-16 22:52:14 +00:00
Adam Powell
e5244b5638 Add isRound to WindowInsets 
isRound allows a view to determine whether the window it is contained
within obscures the corners of the window content. This allows views
aware of this property to adapt their layout accordingly.

Switch ViewRootImpl to use dispatchApplyInsets instead of
fitSystemWindows.

Change-Id: Ic3e3936b73815b2593cb9720af1a309fbd18406e
 2014-04-16 13:59:00 -07:00
Lajos Molnar
2adb422928 Merge "media: don't rely on Java 6 parseInt error on leading '+' sign" 2014-04-16 20:47:40 +00:00
Dan Sandler
a46ceb5881 Merge "Fix NPE if showKeyguard() is not called before hideKeyguard()." 2014-04-16 20:32:58 +00:00
Dan Sandler
63e40170f8 Fix NPE if showKeyguard() is not called before hideKeyguard(). 
Bug: 14112212
Change-Id: Iced1085cf7be8d827cf7e34efe603a399f456c1b
 2014-04-16 16:22:56 -04:00
Craig Mautner
934ef05799 am 4b81e89d: am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev 
* commit '4b81e89d9b7a2cf3ed5aacd9c647aed47f4c4675':
  Fix ActivityContainer callback parcelling.
 2014-04-16 20:13:09 +00:00
Craig Mautner
4b81e89d9b am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev 
* commit '2fd3cb9544df1e09caa725a8d542cf2fe1df0c75':
  Fix ActivityContainer callback parcelling.
 2014-04-16 20:10:26 +00:00
Craig Mautner
2fd3cb9544 Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev 2014-04-16 20:05:31 +00:00
Craig Mautner
e3a00d745f Fix ActivityContainer callback parcelling. 
The Binder interface for passing a callback was not implemented
properly. Also the callback for ActivityContainer now has a new
API.

Change-Id: I6b719be0cb57542f022a3cc14e8f4efde60b1a50
 2014-04-16 13:03:26 -07:00
Mark Salyzyn
2f894fec5b am 24dbfdaa: am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues" 
* commit '24dbfdaa701a729e3b231db63787e0d636b7cc3b':
  frameworks: 64 bit compile issues
 2014-04-16 19:58:26 +00:00
Mark Salyzyn
aa09200932 am 6c925305: am 2760778d: jni: liblog reading error API incorrect 
* commit '6c925305091e6df5eacbb8eb5baaf2c63062a5d9':
  jni: liblog reading error API incorrect
 2014-04-16 19:53:34 +00:00
Mark Salyzyn
24dbfdaa70 am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues" 
* commit '936e87e12dd1335c6f773705fd0a7edb32bc4385':
  frameworks: 64 bit compile issues
 2014-04-16 19:51:10 +00:00
Mark Salyzyn
6c92530509 am 2760778d: jni: liblog reading error API incorrect 
* commit '2760778d7020c31f6b7c28383b0db6e0bef99754':
  jni: liblog reading error API incorrect
 2014-04-16 19:49:23 +00:00
Deepanshu Gupta
2d308a5472 am 6725580a: am 97114e60: am 13ed576e: am cda504f2: am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev 
* commit '6725580a6b34c9fb1d5d99e0d12ccedd6fed29da':
  Improve text rendering and measurement. [DO NOT MERGE]
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-04-16 19:49:15 +00:00
Deepanshu Gupta
79c9285a02 am b873a0a3: (-s ours) am 985bb326: am fa206123: am 502c83f4: am 00312846: (-s ours) am 0fe63473: am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev 
* commit 'b873a0a3abc504b3c6b8db51ea8f3bcb97bc3ac7':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-04-16 19:49:11 +00:00
Deepanshu Gupta
911ad51b05 am 06f4c8c7: (-s ours) am 884f3b14: am 925b911f: am 013af337: am 4eeaa61f: (-s ours) am 87e14187: am fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev 
* commit '06f4c8c7315956a906d054d52ff7f27bf84db8b9':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-04-16 19:49:08 +00:00
Deepanshu Gupta
36e8b4d3cd am a84a1753: (-s ours) am 0cffa9fe: am 43f1fe7e: am 5016f769: am b03e1176: (-s ours) am 533a52fe: am b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'a84a175390c91cd57858f4c539243481d530bfc4':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-04-16 19:49:04 +00:00
Deepanshu Gupta
c92379506d am 43e229a1: (-s ours) am 38f2b1ea: am 30ab17dd: am 289f1ffb: am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit '43e229a111147eca7c7fb7a4623d2d04a4df4b43':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-04-16 19:49:00 +00:00
Wink Saville
8d966e4243 Merge "Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen event" 2014-04-16 19:45:20 +00:00
Deepanshu Gupta
6725580a6b am 97114e60: am 13ed576e: am cda504f2: am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev 
* commit '97114e606219b6d44bb377410f15a0fe9732dd35':
  Improve text rendering and measurement. [DO NOT MERGE]
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-04-16 19:44:40 +00:00
Deepanshu Gupta
b873a0a3ab am 985bb326: am fa206123: am 502c83f4: am 00312846: (-s ours) am 0fe63473: am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev 
* commit '985bb326a6f2b63ed6ee6041654421fae098bcec':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-04-16 19:44:37 +00:00
Deepanshu Gupta
06f4c8c731 am 884f3b14: am 925b911f: am 013af337: am 4eeaa61f: (-s ours) am 87e14187: am fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev 
* commit '884f3b14c654612f922bb3927e17dfa795939594':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-04-16 19:44:34 +00:00
Deepanshu Gupta
a84a175390 am 0cffa9fe: am 43f1fe7e: am 5016f769: am b03e1176: (-s ours) am 533a52fe: am b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '0cffa9fe6c796c69d143493aede11e3f1321262e':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-04-16 19:44:31 +00:00
Deepanshu Gupta
43e229a111 am 38f2b1ea: am 30ab17dd: am 289f1ffb: am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit '38f2b1ea4146a52f167d1a73e705590266848336':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-04-16 19:44:28 +00:00
Mark Salyzyn
936e87e12d am 5788722d: Merge "frameworks: 64 bit compile issues" 
* commit '5788722df7b73f1eff3edb95f2ead83d19603926':
  frameworks: 64 bit compile issues
 2014-04-16 19:42:11 +00:00
Baligh Uddin
3d72c067a0 Merge "Remove activitystrings.xml from localized resource directories" 2014-04-16 19:39:46 +00:00
Deepanshu Gupta
74e14827cf am 492090a5: (-s ours) am 16191f8c: resolved conflicts for merge of 0e2049cd to klp-modular-dev 
* commit '492090a55e2fa94745aaf4e0e295845d8bb1351a':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-04-16 19:38:38 +00:00
Mark Salyzyn
2760778d70 jni: liblog reading error API incorrect 
- return value contains -errno on error.

(cherry pick from commit b519aeca47a7b798926c00ce5c8cf730e26e75fd)

Bug: 13907124
Change-Id: I91f12db5749fac2ae8ed5b0f033d4eaf83e666f5
 2014-04-16 12:33:41 -07:00
Deepanshu Gupta
5a3df66fe8 am 35d46778: (-s ours) resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp 
* commit '35d46778f49c962c990cfc17e521aa80b9e0c016':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-04-16 19:32:13 +00:00
Mark Salyzyn
5788722df7 Merge "frameworks: 64 bit compile issues" 2014-04-16 19:21:44 +00:00
Deepanshu Gupta
492090a55e am 16191f8c: resolved conflicts for merge of 0e2049cd to klp-modular-dev 
* commit '16191f8c4fe92036c8ff2eecd4e57b4642068b99':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-04-16 19:20:01 +00:00
Deepanshu Gupta
97114e6062 am 13ed576e: am cda504f2: am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev 
* commit '13ed576e8ec9914f65234d1616b029bdfb4e86ed':
  Improve text rendering and measurement. [DO NOT MERGE]
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-04-16 19:16:47 +00:00
Deepanshu Gupta
985bb326a6 am fa206123: am 502c83f4: am 00312846: (-s ours) am 0fe63473: am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev 
* commit 'fa206123153a3a8ee48dd6b4e934723f0c2546b8':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-04-16 19:16:43 +00:00
Deepanshu Gupta
884f3b14c6 am 925b911f: am 013af337: am 4eeaa61f: (-s ours) am 87e14187: am fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev 
* commit '925b911f53f0e1484be4232ea6a26e5696c81764':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-04-16 19:16:40 +00:00
Deepanshu Gupta
0cffa9fe6c am 43f1fe7e: am 5016f769: am b03e1176: (-s ours) am 533a52fe: am b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '43f1fe7e5e625f9de515220f375c18db5b5476cd':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-04-16 19:16:37 +00:00
Deepanshu Gupta
38f2b1ea41 am 30ab17dd: am 289f1ffb: am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit '30ab17dde6fb47505be493cb09983e268f97c1e9':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-04-16 19:16:33 +00:00
Deepanshu Gupta
35d46778f4 resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp 
Change-Id: I2fec735ba65f56da7d17022074f8924a259b4bbf
 2014-04-16 12:14:34 -07:00
Lajos Molnar
72bbe6cca6 media: don't rely on Java 6 parseInt error on leading '+' sign 
Also add revision of draft that was used for the implementation.

Related-bug: 5239391
Change-Id: I48c25a6af6a5a1bca83876b97f205c5cef9ebd09
 2014-04-16 12:08:23 -07:00
Deepanshu Gupta
16191f8c4f resolved conflicts for merge of 0e2049cd to klp-modular-dev 
Change-Id: I518e18d0c769a4cb5d325fc22165a8ead36e11de
 2014-04-16 11:58:32 -07:00
Jeff Davidson
34de7a8303 Merge "Stub APIs for network scoring." 2014-04-16 18:56:26 +00:00
Jeff Davidson
b51e0a6c4b Stub APIs for network scoring. 
NetworkScoreManager defines all interactions between the framework and
the scorer app. An ACTION_SCORE_NETWORKS broadcast is sent to the
default scorer with any unscored networks, which responds by calling
updateScores() with scores for those networks. An app may also check
whether they are currently the default scorer with
getDefaultScorerPackage() and request to become the default via the
ACTION_CHANGE_DEFAULT broadcast.

Bug: 13786258
Change-Id: Id3dc0f7c1109f0e3afd73356e2475b7f34167419
 2014-04-16 11:55:14 -07:00
Deepanshu Gupta
9cc58eb963 am 82d5f137: (-s ours) am e5d0fce7: am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit '82d5f137ed03dcd1020fb554a1d0f3029a826282':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-04-16 18:49:33 +00:00
Deepanshu Gupta
13ed576e8e am cda504f2: am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev 
* commit 'cda504f2d54d849fe90924b0d0bf3f817c2a93d7':
  Improve text rendering and measurement. [DO NOT MERGE]
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-04-16 18:47:26 +00:00
Deepanshu Gupta
fa20612315 am 502c83f4: am 00312846: (-s ours) am 0fe63473: am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev 
* commit '502c83f4098cd964cf0c18474700488282396bcb':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-04-16 18:47:23 +00:00
Deepanshu Gupta
925b911f53 am 013af337: am 4eeaa61f: (-s ours) am 87e14187: am fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev 
* commit '013af337bc804a0b491bd3f1e1cba45d61cbe2ea':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-04-16 18:47:20 +00:00
Deepanshu Gupta
43f1fe7e5e am 5016f769: am b03e1176: (-s ours) am 533a52fe: am b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '5016f7694fb4400be468fd49aa83d8075f41d3dc':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-04-16 18:47:17 +00:00
Deepanshu Gupta
30ab17dde6 am 289f1ffb: am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit '289f1ffb33d9ab7ed1a7c11bcc70c017b3a1c710':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-04-16 18:47:15 +00:00
Deepanshu Gupta
cda504f2d5 am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev 
* commit '0aea46840f5a520e511fdbd8561046ac9c665fcb':
  Improve text rendering and measurement. [DO NOT MERGE]
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-04-16 18:43:50 +00:00
Deepanshu Gupta
502c83f409 am 00312846: (-s ours) am 0fe63473: am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev 
* commit '00312846e1e5513b3b32aa4fab399e51daf0c1b3':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-04-16 18:43:47 +00:00