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

128635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
c44762eb5b am 3d678ad4: (-s ours) am 973ddaac: DO NOT MERGE Add isRound to WindowInsets 
* commit '3d678ad462ee237d86efd9d985eb518817761e05':
  DO NOT MERGE Add isRound to WindowInsets
 2014-04-16 23:27:00 +00:00
Alan Viverette
d20974bd51 Clean up VectorDrawable formatting 
Change-Id: I9110f6ddeda9a811e466e58e451fa95eca08e72e
 2014-04-16 16:24:00 -07:00
Adam Powell
3d678ad462 am 973ddaac: DO NOT MERGE Add isRound to WindowInsets 
* commit '973ddaacaef255b8659d35cfe4151dd5b7436138':
  DO NOT MERGE Add isRound to WindowInsets
 2014-04-16 23:23:02 +00:00
Fabrice Di Meglio
2c5453e5ce Merge "Add Preference highlighting" 2014-04-16 23:20:26 +00:00
Adam Powell
23c5bbb090 Merge "Revert the revert of adding isRound to WindowInsets after early merge" 2014-04-16 23:16:51 +00:00
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
Ruben Brunk
7c062369d5 Update DNG tags. 
Change-Id: I497b0fac5d52005c126eaf52c67d30bd224a80b5
 2014-04-16 16:01:29 -07:00
Fabrice Di Meglio
35d7b89b9f Add Preference highlighting 
- use a specific drawable for highlighting a Preference
at a given position
- also add PreferenceFragment.hasListView() as hidden API

Change-Id: If69854cf6c4852d0f45e2c3a9734b1f63b352f9d
 2014-04-16 16:01:13 -07:00
Michael Kolb
46175e1528 Merge "Revert "Add isRound to WindowInsets"" 2014-04-16 22:52:31 +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
Michael Kolb
cc9d276672 Merge "Add isRound to WindowInsets" 2014-04-16 22:51:33 +00:00
Baligh Uddin
cef33e5471 Import translations. DO NOT MERGE 
Change-Id: I192157eeea4a9fd359d2d4c1662a153454242ad5
Auto-generated-cl: translation import
 2014-04-16 15:17:04 -07:00
Baligh Uddin
d247670d6a Import translations. DO NOT MERGE 
Change-Id: Ic128b66fb70754adff7faa7f505f907dea499a68
Auto-generated-cl: translation import
 2014-04-16 15:13:43 -07:00
Baligh Uddin
5b9e559734 Import translations. DO NOT MERGE 
Change-Id: Ice08934e78e95e0c229189902366db69498d82fa
Auto-generated-cl: translation import
 2014-04-16 15:06:32 -07:00
Baligh Uddin
e9002f80eb Import translations. DO NOT MERGE 
Change-Id: I57057544950fecf92d0462ce93f3365660fe8810
Auto-generated-cl: translation import
 2014-04-16 15:00:17 -07:00
Adam Powell
973ddaacae DO NOT MERGE 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

Conflicts:
	core/java/android/view/ViewRootImpl.java
 2014-04-16 14:59:16 -07:00
Jorim Jaggi
e731a4ed3a Merge "Make MENU key work again to dismiss insecure Keyguard." 2014-04-16 21:55:56 +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
Aaron Whyte
d1931ffc07 Allowed custom secure-adb confirmation via Activity or Service. 
It used to only be available via an Activity.

Change-Id: Id79a99a70e721f3b567e75d45ffeba779264ec1e
 2014-04-16 14:50:14 -07: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 35d46778f49c962c990cfc17e521aa80b9e0c016

Change-Id: I5d1abf641564ea19d283f60385d39f7670a2f22e
 2014-04-16 14:46:24 -07:00
Baligh Uddin
81cdde5631 Import translations. DO NOT MERGE 
Change-Id: I1d61ecf2601689f2598a8430fd4ea7b0d4ab80a8
Auto-generated-cl: translation import
 2014-04-16 14:32:46 -07:00
Jeff Davidson
4c37b79cc9 Merge "Class for managing the active scorer application." 2014-04-16 21:32:06 +00:00
Baligh Uddin
b2d50c7d45 Import translations. DO NOT MERGE 
Change-Id: I26770bb21dc101ad08178c8d935bffe73f6a22d7
Auto-generated-cl: translation import
 2014-04-16 14:27:36 -07:00
Baligh Uddin
0e24053e2f Import translations. DO NOT MERGE 
Change-Id: Ie838a6accf3cf31099993dde7f01763a741ef882
Auto-generated-cl: translation import
 2014-04-16 14:25:55 -07:00
Baligh Uddin
d7ee61112e Import translations. DO NOT MERGE 
Change-Id: I9c1fa79848e6ddb1190309328e3dd9a5636b3281
Auto-generated-cl: translation import
 2014-04-16 14:25:21 -07:00
Baligh Uddin
6630196f9f Import translations. DO NOT MERGE 
Change-Id: Ib109389af9ab71e378bbbc6bfbaf057f6880f142
Auto-generated-cl: translation import
 2014-04-16 14:24:32 -07:00
Ricardo Cervera
dc9ca02c51 docs: Watermark images with easter eggs 
Change-Id: I4ab6d614bf43419916633baa062d745f7966a5f9
 2014-04-16 14:22:38 -07: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
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
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
a46ceb5881 Merge "Fix NPE if showKeyguard() is not called before hideKeyguard()." 2014-04-16 20:32:58 +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
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