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

167967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
5fbd9950e7 am 76c234c8: am d0d23c80: Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev 
* commit '76c234c8dfca8203521b022c15a38e041c294589':
  Fix wrong states when waking up from doze via touch
 2014-11-13 16:55:13 +00:00
Craig Mautner
759d34cbd0 am 316e369c: am 30bd3bb7: Revert "Debug for bug 18017409" 
* commit '316e369c4c053125faf9c78d42855f257cfe48a2':
  Revert "Debug for bug 18017409"
 2014-11-13 16:55:07 +00:00
Jorim Jaggi
76c234c8df am d0d23c80: Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev 
* commit 'd0d23c80dae34a126c8024748554a5d07bf3291c':
  Fix wrong states when waking up from doze via touch
 2014-11-13 16:50:53 +00:00
Craig Mautner
316e369c4c am 30bd3bb7: Revert "Debug for bug 18017409" 
* commit '30bd3bb77b8bd1ac70723bcf7f1017fc40ea89b2':
  Revert "Debug for bug 18017409"
 2014-11-13 16:50:48 +00:00
Jorim Jaggi
d0d23c80da Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev 2014-11-13 16:46:57 +00:00
Craig Mautner
30bd3bb77b Revert "Debug for bug 18017409" 
The bug has been fixed. No longer needed.

This reverts commit 5a3c231dc832c205d2bb2f7f0881925b92c9e5e2.

Change-Id: I4a0dda5321f4eeb989c4c58951c43c8d62fd3664
 2014-11-13 08:45:39 -08:00
Jorim Jaggi
68b83a784a Fix wrong states when waking up from doze via touch 
Bug: 18337222
Change-Id: I1cdc213a798ddac18b09accbbc31c59aa2a2d6fc
 2014-11-13 17:09:29 +01:00
Alexandra Gherghina
a28bd7a04b am 7f39e295: am c61cabe5: Merge "Update current.txt with the new extra" into lmp-mr1-dev 
* commit '7f39e29504fe4894d7b26deb35241f3402806952':
  Update current.txt with the new extra
 2014-11-13 15:40:06 +00:00
Alexandra Gherghina
7f39e29504 am c61cabe5: Merge "Update current.txt with the new extra" into lmp-mr1-dev 
* commit 'c61cabe5b3e22c8ebbb0ef91a33c63904ecb9873':
  Update current.txt with the new extra
 2014-11-13 15:36:42 +00:00
Alexandra Gherghina
c61cabe5b3 Merge "Update current.txt with the new extra" into lmp-mr1-dev 2014-11-13 15:31:11 +00:00
Ignacio Solla
b993a4c70b am f3bd15cf: am bf79cbab: Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev 
* commit 'f3bd15cf80ecc748fbd232fec31fdf18d06e48a1':
  [WebView] Allow the WebView to be compiled against the system SDK.
 2014-11-13 15:20:29 +00:00
Alexandra Gherghina
a3b4ab2015 am fca2575b: am 6e33f0fb: Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev 
* commit 'fca2575bffc8bee495cede445849e0183aa9ab51':
  Add extra for account migration in the DevicePolicyMamager
 2014-11-13 15:15:44 +00:00
Geoff Mendal
7a7ac8627b am 9bcd95ee: (-s ours) am f030e66f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '9bcd95ee7fb6d9663de483d1d828d71442944098':
  Import translations. DO NOT MERGE
 2014-11-13 15:15:39 +00:00
Narayan Kamath
cb313d1a61 am 856a0d06: am eed1fba6: Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev 
* commit '856a0d06a64b5aebaf2afcc477bfc82308de7c9a':
  Add detailed javadoc for AssetManager.getLocales.
 2014-11-13 15:15:34 +00:00
Jeff Brown
36ed36a2ea am 4d9bd151: am fef1e0e7: Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev 
* commit '4d9bd1516f7d495ee16bcfeca95a2ab45e33de4c':
  Make Message.setAsynchronous() public.
 2014-11-13 15:15:28 +00:00
Ignacio Solla
f3bd15cf80 am bf79cbab: Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev 
* commit 'bf79cbaba915dbbf419e5f59ca1ab258f64c88b4':
  [WebView] Allow the WebView to be compiled against the system SDK.
 2014-11-13 15:13:06 +00:00
Alexandra Gherghina
fca2575bff am 6e33f0fb: Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev 
* commit '6e33f0fbb57a8afc2184bd9a1798db8bd29e680a':
  Add extra for account migration in the DevicePolicyMamager
 2014-11-13 15:08:01 +00:00
Geoff Mendal
9bcd95ee7f am f030e66f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'f030e66f9d8b931bf58cb36ae3a0e72c9a487d96':
  Import translations. DO NOT MERGE
 2014-11-13 15:07:56 +00:00
Narayan Kamath
856a0d06a6 am eed1fba6: Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev 
* commit 'eed1fba6b54b3305af811b4dd9e367eab01a241b':
  Add detailed javadoc for AssetManager.getLocales.
 2014-11-13 15:07:51 +00:00
Jeff Brown
4d9bd1516f am fef1e0e7: Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev 
* commit 'fef1e0e7f0a6a8d3564031ca4ecf14ab070468ff':
  Make Message.setAsynchronous() public.
 2014-11-13 15:07:46 +00:00
Geoff Mendal
459309349b am 2ebf761e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '2ebf761ebebef65349826e7bd84c667d26e69e51':
  Import translations. DO NOT MERGE
 2014-11-13 15:06:18 +00:00
Ignacio Solla
bf79cbaba9 Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev 2014-11-13 15:03:45 +00:00
Alexandra Gherghina
a73766790a Update current.txt with the new extra 
Bug: 17716971
Change-Id: Ice82394c681665aff96724faa2e8056656d2b1ab
 2014-11-13 14:43:03 +00:00
Alexandra Gherghina
6e33f0fbb5 Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev 2014-11-13 13:59:35 +00:00
Alexandra Gherghina
aaf2f3e895 Add extra for account migration in the DevicePolicyMamager 
This is in preparation for the implementation CL

Bug: 17716971
Change-Id: I3042b0781f48f3d9e84bfff899507b4b5ca156eb
 2014-11-13 12:46:16 +00:00
Geoff Mendal
2ebf761ebe Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-13 09:51:10 +00:00
Geoff Mendal
f030e66f9d Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-13 09:43:51 +00:00
Narayan Kamath
eed1fba6b5 Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev 2014-11-13 09:33:12 +00:00
Geoff Mendal
9976cdbfa3 Import translations. DO NOT MERGE 
Change-Id: I2427bb3c070b9d0d69a2488970a3e74260800190
Auto-generated-cl: translation import
 2014-11-12 23:24:32 -08:00
Geoff Mendal
0df377c7a6 Import translations. DO NOT MERGE 
Change-Id: Ib3433ab22465ba880832eb10196bbab2472a7884
Auto-generated-cl: translation import
 2014-11-12 23:20:52 -08:00
Jeff Brown
fef1e0e7f0 Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev 2014-11-13 07:11:37 +00:00
Andrew Lee
38f99e55d5 am 49b03c23: am 990bbbb3: Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev 
* commit '49b03c2374d035524908251113d27733219e9323':
  Add telephony.DisconnectCause for merged IMS call.
 2014-11-13 02:25:22 +00:00
Andrew Lee
49b03c2374 am 990bbbb3: Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev 
* commit '990bbbb3521b44e23087c15f12d4f17ca14630af':
  Add telephony.DisconnectCause for merged IMS call.
 2014-11-13 02:18:38 +00:00
Andrew Lee
990bbbb352 Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev 2014-11-13 02:15:15 +00:00
Yorke Lee
be65ef8d00 am be5ead83: am 5e783896: Merge "Fix PhoneAccount parceling (1/2)" into lmp-mr1-dev 
* commit 'be5ead83df3c37b5e9f115d46bde04d5c6441ade':
  Fix PhoneAccount parceling (1/2)
 2014-11-13 00:59:58 +00:00
Yorke Lee
be5ead83df am 5e783896: Merge "Fix PhoneAccount parceling (1/2)" into lmp-mr1-dev 
* commit '5e783896a20aeef2cf253331b7db245eade04b64':
  Fix PhoneAccount parceling (1/2)
 2014-11-13 00:55:42 +00:00
Yorke Lee
5e783896a2 Merge "Fix PhoneAccount parceling (1/2)" into lmp-mr1-dev 2014-11-13 00:50:02 +00:00
xinhe
7c42036855 am f6eb33fd: am 031d8fea: Merge "Update enabe/disableCellBroadcast with RAN argument" into lmp-mr1-dev 
* commit 'f6eb33fd0722d69b1ee4b4d5c88820b228bd4689':
  Update enabe/disableCellBroadcast with RAN argument
 2014-11-13 00:48:18 +00:00
xinhe
f6eb33fd07 am 031d8fea: Merge "Update enabe/disableCellBroadcast with RAN argument" into lmp-mr1-dev 
* commit '031d8feaa96c2d47122ba352d282d0f762aac023':
  Update enabe/disableCellBroadcast with RAN argument
 2014-11-13 00:42:44 +00:00
Adam Lesinski
ffd4785e3c am 648f8106: am db3d76ab: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev 
* commit '648f81064747b58be7ea9efab6d5744d6b49397a':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2014-11-13 00:40:28 +00:00
xinhe
031d8feaa9 Merge "Update enabe/disableCellBroadcast with RAN argument" into lmp-mr1-dev 2014-11-13 00:38:00 +00:00
Adam Lesinski
648f810647 am db3d76ab: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev 
* commit 'db3d76ab685955aae4a3e363238a2931d89c6f03':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2014-11-13 00:35:58 +00:00
Adam Lesinski
db3d76ab68 Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev 2014-11-13 00:33:00 +00:00
Chris Craik
b71be9c352 am 9750c696: am 075b2b4f: Merge "Add details and performance warnings to save flag docs" into lmp-mr1-dev 
* commit '9750c6961c5cbe5600ee96efbdfd3cffe0b2a778':
  Add details and performance warnings to save flag docs
 2014-11-13 00:21:04 +00:00
Dianne Hackborn
46a318e22f am e91ab7f0: am 377d80ba: Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev 
* commit 'e91ab7f0809886861268dde78158ee0f413b58f4':
  Put native apps above browser in resolver activity.
 2014-11-13 00:16:13 +00:00
Chris Craik
9750c6961c am 075b2b4f: Merge "Add details and performance warnings to save flag docs" into lmp-mr1-dev 
* commit '075b2b4ff9a9a96462a3102b54fdcabc6e5daf99':
  Add details and performance warnings to save flag docs
 2014-11-13 00:11:55 +00:00
Dianne Hackborn
e91ab7f080 am 377d80ba: Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev 
* commit '377d80ba53d4eda31d131f4f2bd899668cad426b':
  Put native apps above browser in resolver activity.
 2014-11-13 00:07:25 +00:00
Chris Craik
075b2b4ff9 Merge "Add details and performance warnings to save flag docs" into lmp-mr1-dev 2014-11-13 00:05:59 +00:00
Dianne Hackborn
377d80ba53 Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev 2014-11-13 00:03:53 +00:00
Renato Mangini
7b3b8804e7 am 8d6699cc: am 19865ccd: am 5d7f91c7: am 40ac90e9: am 1b657d92: Fix the order of sample categories left nav. 
* commit '8d6699cc9776630a4da4cfcc7b03458569145e17':
  Fix the order of sample categories left nav.
 2014-11-13 00:00:57 +00:00