Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,315 Commits 3 Branches 0 Tags
e4f49cdf2e7a8f896ccc19b0e7eb438f38eecfb0
Commit Graph

131315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
e4f49cdf2e am e0fa592a: Merge "Show enter PIN/PUK before notifications on Keyguard." 
* commit 'e0fa592afc163708d7707158ff76ee8148d90e79':
  Show enter PIN/PUK before notifications on Keyguard.
 2014-04-16 21:58:54 +00:00
Deepanshu Gupta
1befbab7dd am 69e7ff3a: am cf72f259: Fix incorrect merge conflict to klp-modular-dev-plus-aosp 
* commit '69e7ff3a0c656041bff2fdd8b7190d3ee7d30a8c':
  Fix incorrect merge conflict to klp-modular-dev-plus-aosp
 2014-04-16 21:58:50 +00:00
Jorim Jaggi
e0fa592afc Merge "Show enter PIN/PUK before notifications on Keyguard." 2014-04-16 21:55:41 +00:00
Deepanshu Gupta
69e7ff3a0c am cf72f259: Fix incorrect merge conflict to klp-modular-dev-plus-aosp 
* commit 'cf72f25981606b4e48130890f22f713d41e0d420':
  Fix incorrect merge conflict to klp-modular-dev-plus-aosp
 2014-04-16 21:54:04 +00:00
Deepanshu Gupta
cf72f25981 Fix incorrect merge conflict to klp-modular-dev-plus-aosp 
resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp
properly, originally fixed in 35d46778f4

Change-Id: I5d1abf641564ea19d283f60385d39f7670a2f22e
 2014-04-16 14:46:24 -07:00
Jeff Davidson
754e3802cd am 4c37b79c: Merge "Class for managing the active scorer application." 
* commit '4c37b79cc9c3af57be4ca7f9ff40bceaad948d95':
  Class for managing the active scorer application.
 2014-04-16 21:34:26 +00:00
Jeff Davidson
4c37b79cc9 Merge "Class for managing the active scorer application." 2014-04-16 21:32:06 +00:00
Jeff Brown
367687a8b1 am 047f3c71: resolved conflicts for merge of 3ee9dc58 to master 
* commit '047f3c71a48d90a2b022bd886bf581add2d68326':
  Declare VersionCodes.KITKAT_WATCH.
 2014-04-16 21:23:03 +00:00
Jeff Brown
047f3c71a4 resolved conflicts for merge of 3ee9dc58 to master 
Change-Id: Idd045d01246367b77718210c8b6665110da58ac4
 2014-04-16 14:18:49 -07:00
Jeff Davidson
dd6fd1e62b Class for managing the active scorer application. 
Allows listing all possible scorer apps, getting the active scorer
app, setting the active scorer app, and determining whether a given
UID is for the active scorer.

Note that setting a default scorer with a system image will be handled
separately - the plan here is to add a read-only build property
containing a package name to use as the scorer out of the box.
When NetworkScorerService is initialized, it will check a provisioning
bit; if that bit isn't set, it will set the current scorer to the
package specified in this build property (if any) and set the
provisioning bit to true.

Bug: 13769362
Change-Id: I18c0b2ba2aceccc88b70c3611a49149e0bf17ecf
 2014-04-16 14:17:01 -07:00
Lajos Molnar
acd55ab336 am 2adb4229: Merge "media: don\'t rely on Java 6 parseInt error on leading \'+\' sign" 
* commit '2adb422928d35b34cfd8c52170e0df7ffc681816':
  media: don't rely on Java 6 parseInt error on leading '+' sign
 2014-04-16 20:54:45 +00:00
Jeff Brown
3ee9dc58e5 am fa72a9ea: Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev 
* commit 'fa72a9eaae6170e65d9ba72720ee7b0d752f8847':
  Declare VersionCodes.KITKAT_WATCH.
 2014-04-16 20:52:24 +00:00
Jeff Brown
fa72a9eaae Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev 2014-04-16 20:49:15 +00: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
de16234b55 am a46ceb58: Merge "Fix NPE if showKeyguard() is not called before hideKeyguard()." 
* commit 'a46ceb5881ba9d0efc422713455900f06dce4537':
  Fix NPE if showKeyguard() is not called before hideKeyguard().
 2014-04-16 20:37:11 +00:00
Dan Sandler
a46ceb5881 Merge "Fix NPE if showKeyguard() is not called before hideKeyguard()." 2014-04-16 20:32:58 +00:00
Craig Mautner
4f2f1f3a84 am 934ef057: am 4b81e89d: am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev 
* commit '934ef05799532b75d349338c4300671cec1ab162':
  Fix ActivityContainer callback parcelling.
 2014-04-16 20:27:15 +00:00
Mark Salyzyn
faae3d896e am 2f894fec: am 24dbfdaa: am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues" 
* commit '2f894fec5b22948558b22753cc472d4559bea942':
  frameworks: 64 bit compile issues
 2014-04-16 20:27:09 +00:00
Jeff Brown
1c3f332c3f Declare VersionCodes.KITKAT_WATCH. 
The constant does not have a final value yet but is useful for
documentation purposes during development.

Change-Id: Iddd9b956eff822a9a25e9df483b5bd3979189023
 2014-04-16 13:27:00 -07:00
Mark Salyzyn
f4662bf64d am aa092009: am 6c925305: am 2760778d: jni: liblog reading error API incorrect 
* commit 'aa0920093298ac36bb955284ec388b68205f3cb7':
  jni: liblog reading error API incorrect
 2014-04-16 20:26:57 +00:00
Deepanshu Gupta
b9f7a1a4dd am 2d308a54: am 6725580a: am 97114e60: am 13ed576e: am cda504f2: am 0aea4684: am 91f2a7cb: am 5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev 
* commit '2d308a54728a4c45bbea5921b3f8a8cd6032a976':
  Improve text rendering and measurement. [DO NOT MERGE]
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-04-16 20:26:47 +00:00
Deepanshu Gupta
68b15837ea am 79c9285a: 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 '79c9285a0238dcc931a4145edcac608435dfcece':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-04-16 20:26:42 +00:00
Deepanshu Gupta
81c47594cb am 911ad51b: 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 '911ad51b052a0df9e0dde66f83d3ab55e62a3826':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-04-16 20:26:38 +00:00
Deepanshu Gupta
b3143a94e7 am 36e8b4d3: 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 '36e8b4d3cdc7cbd98af1c97f4af3e2524c4cffc2':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-04-16 20:26:32 +00:00
Deepanshu Gupta
662d041f02 am c9237950: 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 'c92379506d057f0bf05ebdf0ec4c7a7b81bf22ef':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-04-16 20:26:27 +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
Evan Charlton
a3db733885 resolved conflicts for merge of 8d966e42 to master-nova 
Change-Id: Ibcc7d1eb4f0349e90b8e97d5235a08efb8226ef6
 2014-04-16 13:14:39 -07: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
Baligh Uddin
cd254448c1 am 3d72c067: Merge "Remove activitystrings.xml from localized resource directories" 
* commit '3d72c067a04a3ef6101e0d3d16d7fb1ba334a908':
  Remove activitystrings.xml from localized resource directories
 2014-04-16 19:45:22 +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
cd9e9f4b43 am 74e14827: am 492090a5: (-s ours) am 16191f8c: resolved conflicts for merge of 0e2049cd to klp-modular-dev 
* commit '74e14827cff43fee85970724ea9e4850316d2e11':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-04-16 19:45:17 +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
Deepanshu Gupta
200479a9f5 am 5a3df66f: am 35d46778: (-s ours) resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp 
* commit '5a3df66fe887aaa0dfa0a48c289ce3078dc34371':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-04-16 19:40:51 +00:00