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

138186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
d0ca7b623b am dfc3bc9b: Fix build. 
* commit 'dfc3bc9b3cf27a72dfd133ce62f5e791ef74659d':
  Fix build.
 2014-06-05 01:10:44 +00:00
Amith Yamasani
80f576f5a8 Merge "Fix messed up current.txt" 2014-06-05 00:22:46 +00:00
Amith Yamasani
8927d4f590 Fix messed up current.txt 
Change-Id: Id472fda6112593c1ba933100249bbd5c6ecb0ccb
 2014-06-04 17:19:24 -07:00
Deepanshu Gupta
33dff284df am 4c0d33f2: Merge "Add basic support for simulating older versions." into lmp-preview-dev 
* commit '4c0d33f29f295e5ae27ba057fc8cb2270295865a':
  Add basic support for simulating older versions.
 2014-06-05 00:02:55 +00:00
Dave Holmes
b6f3264066 am b3b6f148: am b766edce: am 4e99af34: am aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d 
* commit 'b3b6f1481e710a4f528dba962a8d860cc9d391a4':
  Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
 2014-06-04 23:50:38 +00:00
Deepanshu Gupta
58ff7de971 Fix build. 
Change-Id: I877532b5056a035dbd4b0c6c55b5969d6292846a
 2014-06-04 16:50:07 -07:00
Dave Holmes
b3b6f1481e am b766edce: am 4e99af34: am aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to incl 
* commit 'b766edcea3dfdc6513218649b9ad2030bc195c23':
  Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
 2014-06-04 23:45:42 +00:00
Amith Yamasani
f12d4afb85 Merge "Change preference category text color for quantum" 2014-06-04 23:44:30 +00:00
Igor Murashkin
2ac6c43312 am 97b2bc9a: Merge "camera2: Change CaptureListener callbacks to include the session (api)" into lmp-preview-dev 
* commit '97b2bc9a05a56dad609360f8fec1e5a51059e656':
  camera2: Change CaptureListener callbacks to include the session (api)
 2014-06-04 23:42:58 +00:00
Raph Levien
47b24f9c93 am 424f369a: Merge "Turn off elegantTextHeight in quantum theme" into lmp-preview-dev 
* commit '424f369a38371294fdf3fc8d769ae9ca1e790807':
  Turn off elegantTextHeight in quantum theme
 2014-06-04 23:42:57 +00:00
Dave Holmes
b766edcea3 am 4e99af34: am aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to include a link to 
* commit '4e99af342b340bebcd635137966d21c59c294532':
  Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
 2014-06-04 23:41:49 +00:00
Dave Holmes
4e99af342b am aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to include a link to the Building 
* commit 'aabfcb78cf29e3d670831c770b9d757eb79487e4':
  Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
 2014-06-04 23:38:34 +00:00
Deepanshu Gupta
648a309d9b Merge "Add basic support for simulating older versions." into lmp-preview-dev 2014-06-04 23:37:37 +00:00
Dave Holmes
aabfcb78cf Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation." into klp-docs 2014-06-04 23:35:50 +00:00
Igor Murashkin
6e9c5cc617 Merge "camera2: Change CaptureListener callbacks to include the session (api)" into lmp-preview-dev 2014-06-04 23:31:54 +00:00
Raph Levien
cbc9a679d8 Merge "Turn off elegantTextHeight in quantum theme" into lmp-preview-dev 2014-06-04 23:28:47 +00:00
Alan Viverette
c740ffa3c6 am c1462be8: Merge "Update ripple spec, fix ripple mask, rotate progress drawable" into lmp-preview-dev 
* commit 'c1462be80a2581ddd522bf24d91ba183f166de80':
  Update ripple spec, fix ripple mask, rotate progress drawable
 2014-06-04 23:26:57 +00:00
Adam Powell
eab8f9d330 am f0e4ca1b: Merge "Fix list navigation callbacks for ActionBarView" into lmp-preview-dev 
* commit 'f0e4ca1b0398a9709d1516434e6d926f477acd70':
  Fix list navigation callbacks for ActionBarView
 2014-06-04 23:26:56 +00:00
Matthew Williams
cc148b819d am 7e36b718: (-s ours) DO NOT MERGE Redact SyncService stuff from master 
* commit '7e36b7183afc47c81581efad648e7930771e5f9a':
  DO NOT MERGE Redact SyncService stuff from master
 2014-06-04 23:14:44 +00:00
Alan Viverette
1c121e124a Merge "Update ripple spec, fix ripple mask, rotate progress drawable" into lmp-preview-dev 2014-06-04 23:13:55 +00:00
Raph Levien
c499e97667 Turn off elegantTextHeight in quantum theme 
Setting elegantTextHeight to true was a great experiment, but it led to
too much difficulty getting text to fit in space-constrained spaces
(action bar, list items). A long term solution is optical bounds, but
for the time being, just turn it off.

This patch fixes bug 14227056: "Language name displaying under Personal
dictionary are truncated in landscape mode"

Change-Id: I2b0e1ca2e7a06cd0fd9a4d84c1c07fdea2ddbf03
 2014-06-04 16:09:11 -07:00
Adam Powell
2a7b35e80b Merge "Fix list navigation callbacks for ActionBarView" into lmp-preview-dev 2014-06-04 23:04:56 +00:00
Igor Murashkin
21547d66a9 camera2: Change CaptureListener callbacks to include the session (api) 
* Also makes CameraDevice an abstract class (API)

Bug: 15428219
Bug: 14964443
Change-Id: I0e8c8309186aad59570aac7e0f998bb615405f0a
 2014-06-04 16:03:32 -07:00
Ruben Brunk
fcab516cd4 am 37532379: Merge "DNG: Hide unimplemented methods." into lmp-preview-dev 
* commit '37532379e7c770555b140332112a34fe716fed22':
  DNG: Hide unimplemented methods.
 2014-06-04 22:58:48 +00:00
Amith Yamasani
e1b74ec318 Change preference category text color for quantum 
Use the colorAccent theme attribute.

Bug: 15384941
Change-Id: I9f98868313caf30a9658eadede23687f2eca5c9c
 2014-06-04 15:51:41 -07:00
Adam Powell
c9102d743f Fix list navigation callbacks for ActionBarView 
Fix a regression from a previous refactoring where the call ordering
between setNavigationMode and setListNavigationCallbacks could result
in the item selection listener being ignored.

Bug 15395053

Change-Id: I5330f2c684a21448c64c6b62eec10b96405758f7
 2014-06-04 15:49:04 -07:00
Matthew Williams
64939ae385 DO NOT MERGE Redact SyncService stuff from master 
Cherry-pick over 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: Ieebbbcd3324827098e88b36e45e6e82315a51e65
 2014-06-04 22:46:25 +00:00
Matthew Williams
4b8bb98d63 Merge "Redact SyncService stuff from master" 2014-06-04 22:45:24 +00:00
Ruben Brunk
35677d1762 Merge "DNG: Hide unimplemented methods." into lmp-preview-dev 2014-06-04 22:25:18 +00:00
Deepanshu Gupta
c442d5d9db am 9580af6d: Merge "Distinguish between menus in ActionBar and popup." into lmp-preview-dev 
* commit '9580af6dbcb59427ca03efb8f5744101dd6efa32':
  Distinguish between menus in ActionBar and popup.
 2014-06-04 22:20:04 +00:00
Raph Levien
8608bbb207 am 626b82f6: Merge "Query style from asset-created font (Minikin)" into lmp-preview-dev 
* commit '626b82f63e4d7ea97187bec313b5cb687bb501b7':
  Query style from asset-created font (Minikin)
 2014-06-04 22:19:56 +00:00
Deepanshu Gupta
e43dcc1d64 Merge "Distinguish between menus in ActionBar and popup." into lmp-preview-dev 2014-06-04 22:11:37 +00:00
Zhijun He
dcb65c3125 am b4f18bf1: Merge "Camera2: Update availableStreamConfigurations for JPEG sizes" into lmp-preview-dev 
* commit 'b4f18bf11d7f0ca574ed9477486fd50e7c923023':
  Camera2: Update availableStreamConfigurations for JPEG sizes
 2014-06-04 22:11:31 +00:00
Selim Cinek
2a3606ba4a am 2b81c8ef: Merge "Simplified maxPanelHeight logic." into lmp-preview-dev 
* commit '2b81c8ef66cb046d96a950c5cf93cfb9015f4e40':
  Simplified maxPanelHeight logic.
 2014-06-04 22:11:30 +00:00
Elliott Hughes
a2d1454133 am ef3aeeca: am 38a5a257: am 759a8978: Merge "Minor javadoc improvements for PackageManager." 
* commit 'ef3aeecacd4c47f6baeb96d06d69aad1ca4bcb1a':
  Minor javadoc improvements for PackageManager.
 2014-06-04 22:06:28 +00:00
Raph Levien
8224ad4f70 Merge "Query style from asset-created font (Minikin)" into lmp-preview-dev 2014-06-04 22:05:41 +00:00
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