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

131226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
35d46778f4 resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp 
Change-Id: I2fec735ba65f56da7d17022074f8924a259b4bbf
 2014-04-16 12:14:34 -07:00
Jeff Davidson
eec3c36c09 am 34de7a83: Merge "Stub APIs for network scoring." 
* commit '34de7a83033c65f28626aaa9762a91a1646d2486':
  Stub APIs for network scoring.
 2014-04-16 19:10:07 +00:00
Deepanshu Gupta
bf1a6c5825 am 9cc58eb9: am 82d5f137: (-s ours) am e5d0fce7: am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit '9cc58eb9638a69054d7d601b8c6aafc7a82160e7':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-04-16 19:10:03 +00:00
Deepanshu Gupta
63914c53d8 am 9468826d: am f2d085e8: (-s ours) am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit '9468826db20ff30bcd3b4f9b10b07b48393c0c3a':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-04-16 19:09:58 +00:00
Deepanshu Gupta
3752e6b8f0 am f85b903e: am 110a05c6: (-s ours) am 2aee0712: am e75477cb: am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE] 
* commit 'f85b903ec2930c02e28462b9cdafcdf387105739':
  Support custom views using TimePickerDialog [DO NOT MERGE]
 2014-04-16 19:09:54 +00: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
82d5f137ed am e5d0fce7: am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit 'e5d0fce7aeb60c44849cd09815ccecda702422ef':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-04-16 18:43:23 +00:00
Deepanshu Gupta
9468826db2 am f2d085e8: (-s ours) am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit 'f2d085e867dd59aa2aaff74f6e5b265b1bffbaba':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-04-16 18:41:45 +00:00
Deepanshu Gupta
f85b903ec2 am 110a05c6: (-s ours) am 2aee0712: am e75477cb: am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE] 
* commit '110a05c6bd2778b37c83ea5b4d9b753be0ac32ba':
  Support custom views using TimePickerDialog [DO NOT MERGE]
 2014-04-16 18:41:42 +00:00
Deepanshu Gupta
ec6676ddf6 am 86384880: am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '863848808d005fe1d2fd84a2982adfc02a3fbb9f':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-04-16 18:40:55 +00:00
Deepanshu Gupta
e5d0fce7ae am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit '685b7d4165c417ce20b1f6c49190eabcfda09940':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-04-16 18:40:51 +00:00
Deepanshu Gupta
f2d085e867 am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit 'd023360aa03db1a7831a5697d49faa2575e4a9c3':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-04-16 18:39:25 +00:00
Deepanshu Gupta
110a05c6bd am 2aee0712: am e75477cb: am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE] 
* commit '2aee07124cad720587a8c51de5650b6b93ae9150':
  Support custom views using TimePickerDialog [DO NOT MERGE]
 2014-04-16 18:39:21 +00:00
Deepanshu Gupta
0e2049cd39 am bdd0ad79: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit 'bdd0ad79b9b027280bd371c7b6795b04ed89ac8f':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-04-16 18:37:13 +00:00
Deepanshu Gupta
863848808d am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit 'f1e7187645f0b0388f7b97d742395efd228b347a':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-04-16 18:37:10 +00:00
Deepanshu Gupta
685b7d4165 am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit '1b87390c9426c4bc9119829e9375d712dfde11c3':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-04-16 18:37:06 +00:00
Deepanshu Gupta
d023360aa0 am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit '484c88c3655991759dc64276404d0cf7e33b455f':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-04-16 18:36:46 +00:00
Deepanshu Gupta
2aee07124c am e75477cb: am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE] 
* commit 'e75477cb3bf0f2e18c1f0bb743a6189fbc07c2a2':
  Support custom views using TimePickerDialog [DO NOT MERGE]
 2014-04-16 18:36:40 +00:00
Jeff Davidson
ed119096eb am 6a4a9462: Merge "Data structures for communication with network scorer apps." 
* commit '6a4a946223f4b415a174071aa23af8078a4079e3':
  Data structures for communication with network scorer apps.
 2014-04-16 18:36:15 +00:00
Deepanshu Gupta
484c88c365 am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit '4ccc4bd54f85d86818f61d728c6361d2003ddd8e':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-04-16 18:33:00 +00:00
Deepanshu Gupta
e75477cb3b am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE] 
* commit 'acf0bce09fec2cabe871d7146aa62e9258fbf06d':
  Support custom views using TimePickerDialog [DO NOT MERGE]
 2014-04-16 18:32:55 +00:00
Jeff Davidson
6a4a946223 Merge "Data structures for communication with network scorer apps." 2014-04-16 18:29:23 +00:00
Jeff Davidson
dc960e21ef Data structures for communication with network scorer apps. 
NetworkKey represents the necessary information to identify a network
to be scored. ScoredNetwork contains the key to identify a network as
well as a score to be used when evaluating that network (as a curve
based on RSSI).

Bug: 13767776
Change-Id: I6bfebd105c9381e615513167b4332b767b43a23a
 2014-04-16 11:28:51 -07:00
Alan Viverette
2f168179de am 3c24bb4a: Merge "Implement jumpToCurrentState() in VectorDrawable" 
* commit '3c24bb4ae07b44466b146a88276472e0a28d9a03':
  Implement jumpToCurrentState() in VectorDrawable
 2014-04-16 18:26:11 +00:00
Alan Viverette
3c24bb4ae0 Merge "Implement jumpToCurrentState() in VectorDrawable" 2014-04-16 18:21:36 +00:00
Christoph Studer
a709ee5721 am d67d073b: Merge "Rename basePkg to opPkg" 
* commit 'd67d073b9fd110e6b9dfa6af11e8655dcc69f6ef':
  Rename basePkg to opPkg
 2014-04-16 17:45:21 +00:00
Christoph Studer
d67d073b9f Merge "Rename basePkg to opPkg" 2014-04-16 17:37:20 +00:00
Baligh Uddin
1723d6fef6 Remove activitystrings.xml from localized resource directories 
Change-Id: I57fe2e6f60fcebd77118f15db9d06b0f2df56d7c
 2014-04-16 10:35:49 -07:00
Winson Chung
35e120517d am fe08369d: Merge "Fixing the alternate recents transition on landscape views." 
* commit 'fe08369d8cd575f1f1db38f57be4c2a960f4a856':
  Fixing the alternate recents transition on landscape views.
 2014-04-16 17:30:00 +00:00
Winson Chung
fe08369d8c Merge "Fixing the alternate recents transition on landscape views." 2014-04-16 17:25:59 +00:00
Winson Chung
2820c4523c Fixing the alternate recents transition on landscape views. 
- This still assumes that we are taking square thumbnails.

Change-Id: I42a3d1b0505db57f815edf52cd176a3f651d5b37
 2014-04-16 09:56:42 -07:00
Christoph Studer
8fd7f1ed7c Rename basePkg to opPkg 
...and actually populate the field correctly.

Change-Id: I3ce52efedb919d6af75dc9c3532e47764c467cac
 2014-04-16 18:51:25 +02:00
Baligh Uddin
583edcd10a am 3eff39fb: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" 
* commit '3eff39fb0f6425601b67296ee25f0497a70976ae':
  Revert "Import translations. DO NOT MERGE"
 2014-04-16 16:12:56 +00:00
Baligh Uddin
3eff39fb0f Merge "Revert "Import translations. DO NOT MERGE"" 2014-04-16 16:10:08 +00:00
Baligh Uddin
abe94cf196 Revert "Import translations. DO NOT MERGE" 
This reverts commit bcf6441e61725a2e6c04d03de43d209311da9d3a.

Change-Id: I8b556dfaeb45434e194503fe5ae77e744637f6c2
 2014-04-16 16:09:58 +00:00
Christoph Studer
a67e648f3e am 97096fd0: Merge "Write eventlog entries for notification visibility" 
* commit '97096fd0e64d5cdce3e24139ed6b13cc76c5047e':
  Write eventlog entries for notification visibility
 2014-04-16 15:54:18 +00:00
Christoph Studer
97096fd0e6 Merge "Write eventlog entries for notification visibility" 2014-04-16 15:49:54 +00:00
Baligh Uddin
4f71f89361 am 75534344: (-s ours) am e65c292a: (-s ours) am f104f676: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '755343447204575a8efb68769a3e6738987d225d':
  Import translations. DO NOT MERGE
 2014-04-16 15:37:52 +00:00
Baligh Uddin
7553434472 am e65c292a: (-s ours) am f104f676: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'e65c292a5e7f4d70a43f965909647f89bb46809d':
  Import translations. DO NOT MERGE
 2014-04-16 15:34:04 +00:00
Baligh Uddin
eb9063e747 am 3471e803: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '3471e8034975a12cdcdd1b6264ceb6d721031a7e':
  Import translations. DO NOT MERGE
 2014-04-16 15:32:42 +00:00