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

155821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
2ec1416695 am df9cab2f: am ad716e42: am 2aa1d18e: Fix bug 17931760 - spurious timeout leads to mayhem 
* commit 'df9cab2f129adcf5ca85369f155ab13193cd46b3':
  Fix bug 17931760 - spurious timeout leads to mayhem
 2014-10-10 00:41:28 +00:00
Christoph Studer
efeb94a87d am a6a6f4b2: am a2830b7d: am 2c2cb29a: Merge "WallpaperCropper: Use white color for action bar" into lmp-dev 
* commit 'a6a6f4b218b9801be842207fe93c74e1f076cb68':
  WallpaperCropper: Use white color for action bar
 2014-10-10 00:41:24 +00:00
Justin Koh
a53995be1d am d853a900: am 1840bfee: Merge "Make GlobalKeyManager broadcasts send as foreground" into lmp-sprout-dev 
* commit 'd853a90026ebbab1d23dd8e1a627be26c3c2410a':
  Make GlobalKeyManager broadcasts send as foreground
 2014-10-10 00:41:19 +00:00
Adam Lesinski
983b668bd8 am be003a35: am f23e3ea6: am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev 
* commit 'be003a357026a54c9fd0ae65cdc909f9b0cbc384':
  Search all packages for a given type string when looking up resources by name
 2014-10-10 00:41:15 +00:00
Dianne Hackborn
57af6ac767 am d190a5ca: am 0e259ce2: am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 
* commit 'd190a5ca4c0501f01d2eb5a0359bd987cb703b0c':
  Implement issue #17906468: Allow search request to fall back to global search
 2014-10-10 00:41:11 +00:00
Jorim Jaggi
f47ca47765 am e10e0dbc: am fc779ccf: am 01f1c5c8: Merge "Fix content description for bluetooth icon" into lmp-dev 
* commit 'e10e0dbc860b12911634a430614163377481a73b':
  Fix content description for bluetooth icon
 2014-10-10 00:41:07 +00:00
Joe Fernandez
039e217d32 am daf00ceb: am 487e15b9: am 401418d5: Merge "Revert "Removed preview license."" into lmp-dev 
* commit 'daf00ceb3b1f2affaf585d5a16278864b01760d0':
  Revert "Removed preview license."
 2014-10-10 00:41:03 +00:00
Sandeep Siddhartha
a591efe283 am dbc9aa2c: am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'dbc9aa2c7ced2a961f1a0cbe02e179edd439d53b':
  Add tests for model management [SDK Only]
 2014-10-10 00:40:58 +00:00
Etan Cohen
d5ea324063 am c3f8a8b1: am 4354e604: am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying. 
* commit 'c3f8a8b1ec788a65c247203ddb268a9acc634ab7':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
 2014-10-10 00:40:54 +00:00
Christopher Tate
df9cab2f12 am ad716e42: am 2aa1d18e: Fix bug 17931760 - spurious timeout leads to mayhem 
* commit 'ad716e42e89cc5fe92c3ff86ec2714c416d522aa':
  Fix bug 17931760 - spurious timeout leads to mayhem
 2014-10-10 00:31:53 +00:00
Christoph Studer
a6a6f4b218 am a2830b7d: am 2c2cb29a: Merge "WallpaperCropper: Use white color for action bar" into lmp-dev 
* commit 'a2830b7da7bb27976bd497245e6e1fa4d8a428e9':
  WallpaperCropper: Use white color for action bar
 2014-10-10 00:31:31 +00:00
Justin Koh
d853a90026 am 1840bfee: Merge "Make GlobalKeyManager broadcasts send as foreground" into lmp-sprout-dev 
* commit '1840bfee70ac85026072222cabe77709d849d7c7':
  Make GlobalKeyManager broadcasts send as foreground
 2014-10-10 00:31:24 +00:00
Adam Lesinski
be003a3570 am f23e3ea6: am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev 
* commit 'f23e3ea629f29060f34ea10a0d89c6ec22766789':
  Search all packages for a given type string when looking up resources by name
 2014-10-10 00:30:39 +00:00
Dianne Hackborn
d190a5ca4c am 0e259ce2: am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 
* commit '0e259ce2d7ed09c58993da5c5b63966e8f467c82':
  Implement issue #17906468: Allow search request to fall back to global search
 2014-10-10 00:30:33 +00:00
Jorim Jaggi
e10e0dbc86 am fc779ccf: am 01f1c5c8: Merge "Fix content description for bluetooth icon" into lmp-dev 
* commit 'fc779ccf865df605310a2da309a3d694b4c0e613':
  Fix content description for bluetooth icon
 2014-10-10 00:30:28 +00:00
Joe Fernandez
daf00ceb3b am 487e15b9: am 401418d5: Merge "Revert "Removed preview license."" into lmp-dev 
* commit '487e15b90140b0a1f343c61eb0ea658db3caa1b7':
  Revert "Removed preview license."
 2014-10-10 00:30:23 +00:00
Sandeep Siddhartha
dbc9aa2c7c am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'eecf74bcf7746c20f4b8cf69448e4b292357026d':
  Add tests for model management [SDK Only]
 2014-10-10 00:30:18 +00:00
Etan Cohen
c3f8a8b1ec am 4354e604: am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying. 
* commit '4354e6046e4a35b2f35348c6c131fdd600ac26af':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
 2014-10-10 00:30:14 +00:00
Christopher Tate
ad716e42e8 am 2aa1d18e: Fix bug 17931760 - spurious timeout leads to mayhem 
* commit '2aa1d18e3acd269ed7a5f5a4843d447735f0676c':
  Fix bug 17931760 - spurious timeout leads to mayhem
 2014-10-09 23:06:27 +00:00
Christopher Tate
2aa1d18e3a Fix bug 17931760 - spurious timeout leads to mayhem 
We know a priori that the PMBA metadata package's backup pass
doesn't need to be tracked for timeout, because it's run inline
rather than as an asynchronous separate-process operation.

Change-Id: Ifd21ab3a016917f5e557a38c1c88f8d8ac1337d2
 2014-10-09 15:20:24 -07:00
Jorim Jaggi
782994efd3 am 51650235: Merge "Apply color to progress bar for notifications" into lmp-mr1-dev 
* commit '51650235c1bd70c5b5c0d82fed31390008f94c89':
  Apply color to progress bar for notifications
 2014-10-09 22:07:20 +00:00
Jorim Jaggi
51650235c1 Merge "Apply color to progress bar for notifications" into lmp-mr1-dev 2014-10-09 22:01:56 +00:00
Christoph Studer
a2830b7da7 am 2c2cb29a: Merge "WallpaperCropper: Use white color for action bar" into lmp-dev 
* commit '2c2cb29a3d7f0a90d753b0fa9c32c1fc5cdbff32':
  WallpaperCropper: Use white color for action bar
 2014-10-09 21:01:07 +00:00
Christoph Studer
2c2cb29a3d Merge "WallpaperCropper: Use white color for action bar" into lmp-dev 2014-10-09 20:56:45 +00:00
Christoph Studer
9e8482062d WallpaperCropper: Use white color for action bar 
Bug: 17343815
Change-Id: I5802f04204d081b97fbc2e2cb203fa03f16fea6a
 2014-10-09 13:50:21 -07:00
Justin Koh
1840bfee70 Merge "Make GlobalKeyManager broadcasts send as foreground" into lmp-sprout-dev 2014-10-09 20:49:03 +00:00
Elliott Hughes
67ed9bdef9 am 011c96b5: Merge "Remove some unused %% strings from frameworks/base." into lmp-mr1-dev 
* commit '011c96b556485552d84368130b5e4422ece25baa':
  Remove some unused %% strings from frameworks/base.
 2014-10-09 20:36:49 +00:00
Justin Koh
b0b823f71b Make GlobalKeyManager broadcasts send as foreground 
Should prioritize these since they are due to user interaction.

Change-Id: If36d5502dbd53de6102b05fd54caed56e22685da
 2014-10-09 13:33:19 -07:00
Elliott Hughes
011c96b556 Merge "Remove some unused %% strings from frameworks/base." into lmp-mr1-dev 2014-10-09 20:31:40 +00:00
Elliott Hughes
8d092c231f am 7d32838d: Merge "Track change to private libcore data structure." into lmp-mr1-dev 
* commit '7d32838d7817be6528b8b63ccb3a985b9cd582c1':
  Track change to private libcore data structure.
 2014-10-09 20:20:09 +00:00
Elliott Hughes
7d32838d78 Merge "Track change to private libcore data structure." into lmp-mr1-dev 2014-10-09 20:15:52 +00:00
Adam Powell
0f61804f18 am 7cb761fe: Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev 
* commit '7cb761fe8c29fc00e66515c40f7fcb9111b70da0':
  Document that MarginLayoutParams margins should be positive.
 2014-10-09 20:12:29 +00:00
Adam Powell
7cb761fe8c Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev 2014-10-09 20:08:41 +00:00
Adam Powell
02091f071a am 19a9e6c2: Merge "Throw a more descriptive exception when adding null to a ViewGroup" into lmp-mr1-dev 
* commit '19a9e6c23b44e4fbee2f559e921170e34732d858':
  Throw a more descriptive exception when adding null to a ViewGroup
 2014-10-09 20:00:39 +00:00
Adam Powell
19a9e6c23b Merge "Throw a more descriptive exception when adding null to a ViewGroup" into lmp-mr1-dev 2014-10-09 19:57:00 +00:00
Adam Powell
a7a735fb2a Document that MarginLayoutParams margins should be positive. 
Negative margins can cause all sorts of other problematic assumptions,
subtle errors and unexpected behavior. While they technically work
developers should steer clear of them.

Change-Id: Ia1f7d9a33e25444ebdc3c32679ae1179210558e1
 2014-10-09 12:54:52 -07:00
Adam Lesinski
f23e3ea629 am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev 
* commit 'aeef612f200b6b5cee214230271e1c3d718151ee':
  Search all packages for a given type string when looking up resources by name
 2014-10-09 19:30:31 +00:00
Dianne Hackborn
0e259ce2d7 am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 
* commit '6166a824b2ea7b7918f54769005ab691e15f77f7':
  Implement issue #17906468: Allow search request to fall back to global search
 2014-10-09 19:30:26 +00:00
Jorim Jaggi
fc779ccf86 am 01f1c5c8: Merge "Fix content description for bluetooth icon" into lmp-dev 
* commit '01f1c5c85476b7eee3155ac1a1f6b570582ecd6c':
  Fix content description for bluetooth icon
 2014-10-09 19:30:16 +00:00
Joe Fernandez
487e15b901 am 401418d5: Merge "Revert "Removed preview license."" into lmp-dev 
* commit '401418d53b699e6cde53e45fba066c933868b6c1':
  Revert "Removed preview license."
 2014-10-09 19:30:00 +00:00
Sandeep Siddhartha
eecf74bcf7 am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'ed65c63bdc4a4413da5195f7e5fa392ce72f6135':
  Add tests for model management [SDK Only]
 2014-10-09 19:29:55 +00:00
Etan Cohen
4354e6046e am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying. 
* commit '5e5bc4b13cd1fc657da940c14e2333d8d3b18080':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
 2014-10-09 19:29:43 +00:00
Robin Lee
d92e9bebdf am 499a3629: am 4a718f2a: am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 
* commit '499a36294b48acf5c77f36281ddb40ef205dc596':
  DevicePolicy: One cert tracker warning per profile
 2014-10-09 19:23:27 +00:00
Joe Fernandez
d240b98f99 am b455eb7b: am 5b349c4c: am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'b455eb7b32748c326bf64467223a8e553d630176':
  docs: Android TV publishing requirements
 2014-10-09 19:23:23 +00:00
Chong Zhang
8dac6fe7ae am d4410a19: am d25b996a: am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit 'd4410a19bcad9e402c2a8f31576454a061c0c110':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-09 19:23:19 +00:00
Christopher Tate
c049e123be am 97cb995e: am f857b272: am 2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev 
* commit '97cb995e990ab868355f109c1466a810dbad4d35':
  Also monitor MOVED_TO events for wallpaper updates
 2014-10-09 19:23:15 +00:00
Fred Fettinger
0ebdc70d7a am 1114b3b8: am 708206c3: am 6c858c25: am b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE 
* commit '1114b3b8d74aee0f1ec17f9f7b7f8e8c3cb3b4ca':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
 2014-10-09 19:23:11 +00:00
mike dooley
a83896ce73 am 6e24a156: am 3175824a: am 879142bf: Fix hangouts conference calling regression. 
* commit '6e24a156cd9a43ff782926a8d5618ed63944a933':
  Fix hangouts conference calling regression.
 2014-10-09 19:23:07 +00:00
Tim Kilbourn
79297f3c1c am bb76d5cd: am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev 
* commit 'bb76d5cd886f34165e59a35a36c353fe559929c7':
  Don't start SearchDialog on television.
 2014-10-09 19:23:00 +00:00
Jeff Brown
847d269297 am 8aa2e3f1: am ab46eda8: am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev 
* commit '8aa2e3f168bc68b1ed59d0ea14a212bdb1837fa8':
  Ensure we correctly unblank displays when added.
 2014-10-09 19:22:56 +00:00