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

138514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
a0c808bb75 am d842513c: Merge "Launch document sharing into unique activities" into lmp-preview-dev 
* commit 'd842513c3df5fd3e46a70ab6798b4d3d20c4ef0b':
  Launch document sharing into unique activities
 2014-06-04 22:03:12 +00:00
Elliott Hughes
ef3aeecacd am 38a5a257: am 759a8978: Merge "Minor javadoc improvements for PackageManager." 
* commit '38a5a257a9aaf85606eb7117d943a877dc7d3c93':
  Minor javadoc improvements for PackageManager.
 2014-06-04 22:02:34 +00:00
Zhijun He
d618169619 Merge "Camera2: Update availableStreamConfigurations for JPEG sizes" into lmp-preview-dev 2014-06-04 21:56:27 +00:00
Matthew Williams
5a9decd589 Redact SyncService stuff from master 
This changes the API surface area, deleting things we aren't releasing.
I'll do the internal clean-up at the same time I do the SyncManager
refactor to sit on top of the TaskManager.
Bug: 14997851
Change-Id: Ibefbb246f0e98d3159399151744279902468a23c
 2014-06-04 14:55:53 -07:00
Elliott Hughes
3407c25499 am fc01a668: am c1973c28: am c0f4ac1b: Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag" 
* commit 'fc01a6687ba6e51a40bf448cf33367d1f1216544':
  Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag
 2014-06-04 21:53:17 +00:00
Selim Cinek
45474056ea Merge "Simplified maxPanelHeight logic." into lmp-preview-dev 2014-06-04 21:49:04 +00:00
Elliott Hughes
fc01a6687b am c1973c28: am c0f4ac1b: Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag" 
* commit 'c1973c2888bde77f2dd5dbdba6225afb8829ed46':
  Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag
 2014-06-04 21:48:08 +00:00
Elliott Hughes
38a5a257a9 am 759a8978: Merge "Minor javadoc improvements for PackageManager." 
* commit '759a89782d38ddf6ab7f4a2c22c8911ea206b275':
  Minor javadoc improvements for PackageManager.
 2014-06-04 21:46:12 +00:00
Alan Viverette
b996d809bf Update ripple spec, fix ripple mask, rotate progress drawable 
Change-Id: I4fc155bf2f12d9f324c354dee81479f9cddafac4
 2014-06-04 14:35:42 -07:00
Adam Powell
27f78dc7f2 am 45366a20: Merge "Fix EdgeEffect clipping and AbsListView\'s use of it" into lmp-preview-dev 
* commit '45366a2036483d5beca5b9cffdb5acdae72d787a':
  Fix EdgeEffect clipping and AbsListView's use of it
 2014-06-04 21:32:57 +00:00
Selim Cinek
ba9547c0af am 62f877c7: Merge "Fixed an animation bug" into lmp-preview-dev 
* commit '62f877c7226450edcc5548fbd89be67665b65947':
  Fixed an animation bug
 2014-06-04 21:32:51 +00:00
Robert Greenwalt
e72da405fb am d060ac14: (-s ours) Merge "DO NOT MERGE Report new network scores back to factories." into lmp-preview-dev 
* commit 'd060ac1433cec943e915b026cb5c76bd6615538e':
  DO NOT MERGE Report new network scores back to factories.
 2014-06-04 21:32:34 +00:00
Eric Laurent
9e80b82d96 am b1873bdd: Merge "AudioSystem JNI: fix audio gain channel count" into lmp-preview-dev 
* commit 'b1873bdd565509097b6fe711773dc023589f9a11':
  AudioSystem JNI: fix audio gain channel count
 2014-06-04 21:32:13 +00:00
Raph Levien
f8423bae17 am 8fad12dc: Merge "Fix incorrect getStringBounds (Minikin)" into lmp-preview-dev 
* commit '8fad12dc66f47af2fd394f44858802d10cf110f1':
  Fix incorrect getStringBounds (Minikin)
 2014-06-04 21:32:07 +00:00
Fabrice Di Meglio
838c580a10 am 60a6c7f5: Merge "Update permissions assets for Quantum Theme" into lmp-preview-dev 
* commit '60a6c7f59b3ae3c014211753162b2370e61e70d4':
  Update permissions assets for Quantum Theme
 2014-06-04 21:32:00 +00:00
Eric Laurent
aaa688972a am 25d7a394: Merge "add permission for AudioManager routing APIs." into lmp-preview-dev 
* commit '25d7a394c0cf91d9e9711d3f36913f4ed8aa91d8':
  add permission for AudioManager routing APIs.
 2014-06-04 21:31:49 +00:00
Adrian Roos
7cbd327d0c am 32a69218: (-s ours) Merge "Hide TrustAgentService in lmp-preview - DO NOT MERGE" into lmp-preview-dev 
* commit '32a6921865b0cb9999a3d8b22597ee0680577fd5':
  Hide TrustAgentService in lmp-preview - DO NOT MERGE
 2014-06-04 21:31:45 +00:00
Elliott Hughes
c1973c2888 am c0f4ac1b: Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag" 
* commit 'c0f4ac1bb8668702fa0f053d0ca219bab7dde67c':
  Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag
 2014-06-04 21:29:08 +00:00
Elliott Hughes
759a89782d Merge "Minor javadoc improvements for PackageManager." 2014-06-04 21:26:49 +00:00
Elliott Hughes
c0f4ac1bb8 Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag" 2014-06-04 21:13:57 +00:00
Robin Lee
7f2d5162fd am c774caff: am 4891a9f9: am e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes" 
* commit 'c774caff86d2e5dc5ca3a0008007cb0fd384568b':
  Assign AID_EVERYONE gid to newly-created processes
 2014-06-04 21:13:24 +00:00
Craig Mautner
4c6debb767 Merge "Launch document sharing into unique activities" into lmp-preview-dev 2014-06-04 21:13:06 +00:00
Robin Lee
c774caff86 am 4891a9f9: am e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes" 
* commit '4891a9f9cfee569c0d362f1781f44493f5e320c0':
  Assign AID_EVERYONE gid to newly-created processes
 2014-06-04 21:09:52 +00:00
Deepanshu Gupta
9288548527 am e478c562: am 905e113f: am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'e478c5624d5eeca5adc088d9328582bd5b487963':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:56:26 +00:00
Zhijun He
df9b74781a Camera2: Update availableStreamConfigurations for JPEG sizes 
Also Fix some doc issue in availableCapabilities

Bug: 12035686
Change-Id: Ie517a587f4a9e6cd9731fcca042e24adf832d9e3
 2014-06-04 20:56:20 +00:00
Adam Powell
f5188cf6d5 Merge "Fix EdgeEffect clipping and AbsListView's use of it" into lmp-preview-dev 2014-06-04 20:55:57 +00:00
Robin Lee
4891a9f9cf am e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes" 
* commit 'e46e60041215249a285384cd2282de9f4d956a04':
  Assign AID_EVERYONE gid to newly-created processes
 2014-06-04 20:55:02 +00:00
Jorim Jaggi
095e3d300e am 51309c7a: Merge "Fix not being able to dismiss notifications with tap." into lmp-preview-dev 
* commit '51309c7ad93b2cbbe8fec828a49542d1207c4aa5':
  Fix not being able to dismiss notifications with tap.
 2014-06-04 20:53:01 +00:00
Selim Cinek
f3397e04a5 am 75bf1fe9: Merge "Fixed panel top padding animation regression" into lmp-preview-dev 
* commit '75bf1fe9132cb97c073e53b034d10807e602da4e':
  Fixed panel top padding animation regression
 2014-06-04 20:52:55 +00:00
Robert Greenwalt
51e0be16b4 am 02006632: Merge "Call a network restricted only if all capabilities are restricted" into lmp-preview-dev 
* commit '02006632ef34d70e196a47a3b11ff344005acbb1':
  Call a network restricted only if all capabilities are restricted
 2014-06-04 20:52:50 +00:00
Selim Cinek
b2007f3ac6 am e7a2ece7: Merge "Fixed flickering in panel overscroll" into lmp-preview-dev 
* commit 'e7a2ece7852933a9c857e0615601f70abf469f05':
  Fixed flickering in panel overscroll
 2014-06-04 20:52:45 +00:00
Jorim Jaggi
8abb0a8398 am 6dc68cab: Merge "Fix Keyguard crash when in landscape." into lmp-preview-dev 
* commit '6dc68cab1858bc899fb3209c61dc86a813e7b8ff':
  Fix Keyguard crash when in landscape.
 2014-06-04 20:52:38 +00:00
Deepanshu Gupta
e478c5624d am 905e113f: am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '905e113f97560dbcf71cab517ab4c1ee4faaa4d3':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:52:36 +00:00
Jorim Jaggi
bdd22d6822 am 34ed4600: Merge "Fix padding in more card." into lmp-preview-dev 
* commit '34ed46008c725ae3893f23875f3012e35efc5edb':
  Fix padding in more card.
 2014-06-04 20:52:33 +00:00
Selim Cinek
57794dee23 am 246265c2: Merge "In the speedbump view, use hasOverlappingRenderings instead of layers" into lmp-preview-dev 
* commit '246265c228da399b7b894c158c713f06396538ec':
  In the speedbump view, use hasOverlappingRenderings instead of layers
 2014-06-04 20:52:25 +00:00
Selim Cinek
29928942ed am dd225891: Merge "Disabled touch interaction when in Quick settings." into lmp-preview-dev 
* commit 'dd225891718fa79378e3ec8119aafa0dbb17a82e':
  Disabled touch interaction when in Quick settings.
 2014-06-04 20:52:20 +00:00
Adrian Roos
ee920d5007 am 612734fb: Merge "Display time to charge on lock screen" into lmp-preview-dev 
* commit '612734fbfa24b925d51dcf47260a87290629f220':
  Display time to charge on lock screen
 2014-06-04 20:52:14 +00:00
Selim Cinek
67985dd51e am b8bf46b2: Merge "Fixed that app-info longpress was lost on configuration changes." into lmp-preview-dev 
* commit 'b8bf46b250c7f299d6fcfe7942fdbfabb688f27a':
  Fixed that app-info longpress was lost on configuration changes.
 2014-06-04 20:52:08 +00:00
Selim Cinek
7336a5d061 am a4e01205: Merge "Changed the overscroll and expanding behaviour." into lmp-preview-dev 
* commit 'a4e01205c0782dccfe56597bd1144c75b4e08081':
  Changed the overscroll and expanding behaviour.
 2014-06-04 20:52:03 +00:00
Jorim Jaggi
b73afd0a1f am af4418ff: Merge "Fix more card appearance to spec from design." into lmp-preview-dev 
* commit 'af4418ffb2b5bf289f85fb91a47fc63fc36949cd':
  Fix more card appearance to spec from design.
 2014-06-04 20:51:58 +00:00
Robin Lee
e46e600412 Merge "Assign AID_EVERYONE gid to newly-created processes" 2014-06-04 20:51:55 +00:00
George Mount
14ec02afa0 am 46e2688a: Merge "Create reasonable Activity Transition defaults for quantum theme." into lmp-preview-dev 
* commit '46e2688a20758d8529ccd3da83a0fcbbf3e8b5fb':
  Create reasonable Activity Transition defaults for quantum theme.
 2014-06-04 20:51:52 +00:00
Deepanshu Gupta
905e113f97 am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '03df93bcb854eedc600ef0120fd238ec974c44a1':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:48:19 +00:00
Adam Powell
9be22455ac Fix EdgeEffect clipping and AbsListView's use of it 
Make sure that we clip the edge glow against the edges of the view and
not against padding. If we're clipping to padding already, this will
happen automatically.

Bug 15020863

Change-Id: I4645c92f2a372d3c9fa8bb5a9fda44c0d82ac4cf
 2014-06-04 13:46:55 -07:00
Raph Levien
1633caef58 Query style from asset-created font (Minikin) 
This patch sets fStyle on the TypefaceImpl based on querying the font,
which is important in the Typeface.createFromAsset path. This fixes both
the style returned from getStyle() and also selects fallback fonts to
best match the style of the main font.

Fixes bug 15429916: "Typeface.getStyle always returning 0 in some L
devices".

Change-Id: I1992ba1e65e7f488d331e175f5f12843f67c2faa
 2014-06-04 13:46:35 -07:00
Deepanshu Gupta
03df93bcb8 am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '5cde33a6ffd6a3be87f6622e67c3d83fb61519cb':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:45:02 +00:00
Deepanshu Gupta
e770910162 am 9f213b1e: (-s ours) am 46c3beef: am 3ce1ca68: am 0ed9d498: am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '9f213b1e2b2db2589cbe2f6554fd6e18ed871bad':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:43:08 +00:00
Deepanshu Gupta
1ef8b7cb3d am 3c15d8d6: (-s ours) am 14104896: am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev 
* commit '3c15d8d6889806d0b517eec03ed6a4f8728ebc16':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:43:02 +00:00
Deepanshu Gupta
be9c94ef26 Merge "Distinguish between menus in ActionBar and popup." 2014-06-04 20:42:07 +00:00
Deepanshu Gupta
5cde33a6ff am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'dcfba78fbb4dad6792113383b2d32eff7f2c1f88':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:41:47 +00:00