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

195093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yorke Lee
107c4ce2ac Send broadcast when default dialer changes 
Add hidden TelecomManager.setDefaultDialer for system apps
to set the default dialer and trigger the broadcast

Bug: 21846308
Change-Id: Ifdd30cd1323ab0157edf7fd966173b6c52df6ba0
 2015-06-15 12:36:09 -07:00
Yorke Lee
31104fbb7e Merge "Add adb shell telecom get-system-dialer" into mnc-dev 2015-06-15 16:19:43 +00:00
Geoff Mendal
40f7418d81 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-15 16:15:47 +00:00
Geoff Mendal
60c66b6b7a Import translations. DO NOT MERGE 
Change-Id: I72bd7dadaaf60d676140eedd28f33db15c5bfeb6
Auto-generated-cl: translation import
 2015-06-15 09:14:54 -07:00
Diego Perez
898be8bc76 am fa794eb0: am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev 
* commit 'fa794eb0025dbec6c1b90135495081d42f06bdaf':
  Fix for shadows on theme editor
 2015-06-15 15:48:29 +00:00
Diego Perez
dc929e28ac am 40a216d9: am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev 
* commit '40a216d95973bb897ee0d755ef260a616f176798':
  Fix GcSnapshot drawInLayer when clipping is used.
 2015-06-15 15:48:24 +00:00
Dirk Dougherty
d216161598 am c6d33420: am 4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs 
* commit 'c6d3342064db4982298d0ebe79c8b974c57b99a7':
  Doc change: move ndk docs jd into main docs tree.
 2015-06-15 15:48:14 +00:00
Andrew Solovay
dba3544fe0 am ecc50268: am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs 
* commit 'ecc50268d72f0084a96bf98494229a294be10458':
  docs: Added AfW videos to "Android for Work" landing page
 2015-06-15 15:48:05 +00:00
Rich Slogar
974f0d8228 am afb19e27: am 726db0af: Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs 
* commit 'afb19e27ccc80415956c1b63ddb19e953a7c3f20':
  docs: sdk tools 24.3.2 download updates
 2015-06-15 15:47:49 +00:00
Diego Perez
b39e85afb1 am ce5a79da: am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev 
* commit 'ce5a79dacfb152317429cb69c28fe8bb39c02f4c':
  New custom widgets library
 2015-06-15 15:47:44 +00:00
Chet Haase
c03fa1ee54 Merge "Add isFilterBitmap() overrides where appropriate" into mnc-dev 2015-06-15 15:45:57 +00:00
Diego Perez
0524e97ac3 Merge "resolved conflicts for merge of 5a53816b to mnc-dev" into mnc-dev 2015-06-15 15:44:14 +00:00
Chet Haase
ea1363910b Add isFilterBitmap() overrides where appropriate 
Issue #21825791 add isFilterBitmap() override to appropriate Drawable subclasses

Change-Id: I5cbd72c034be79b0aa53815c7a5a8ea499e6e02d
 2015-06-15 08:43:27 -07:00
Jason Monk
4b8704c9e1 Merge "Don't try to get entries for uninstalled apps." into mnc-dev 2015-06-15 15:41:38 +00:00
Jason Monk
c1f24abd10 Don't try to get entries for uninstalled apps. 
Bug: 21837824
Change-Id: I6f7bbc309e9edf1db12476f55ab8be424739fae0
 2015-06-15 11:38:03 -04:00
Diego Perez
8df6d037be resolved conflicts for merge of 5a53816b to mnc-dev 
Change-Id: Ice1ba8cb9793432e18635e77f4e3309f50bb7b3f
 2015-06-15 16:17:08 +01:00
Prashant Malani
6a7fdbddf7 am a8cff2ac: (-s ours) am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev 
* commit 'a8cff2acb7cc18d1cf123f45eb4e47e1ab876a20':
  DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
 2015-06-15 14:30:35 +00:00
Filip Gruszczynski
5b15bd7b2d am 94476be6: (-s ours) am 88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev 
* commit '94476be6a4055d09413d51e489446bf220c440a6':
  DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
 2015-06-15 14:30:30 +00:00
Leon Scroggins III
0af86ee769 am d7959d30: (-s ours) am 265d053d: am 81babaa3: am 7ffde4a6: am e899576f: am 48b38452: am a6932472: am 5b751c80: (-s ours) am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
* commit 'd7959d30b61962a905de6c5081dac6b2f7be65c1':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-15 14:30:25 +00:00
Leon Scroggins III
c3809332fc am 8c9ae41b: (-s ours) am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev 
* commit '8c9ae41bc7188cfe929d0b4f31c18faf9f9a03f7':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-15 14:30:20 +00:00
Jason Monk
7d79bea4a9 Merge "Fix invisible rotation tile" into mnc-dev 2015-06-15 14:26:38 +00:00
Jason Monk
1634d182e1 Fix invisible rotation tile 
Make sure we set the state at least once.

Bug: 21837219
Change-Id: Iabd0524f0c09fd3f7b895007204ddf49af19ea98
 2015-06-15 10:19:26 -04:00
Jason Monk
5d8c276bb9 Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev 2015-06-15 14:14:52 +00:00
Jason Monk
6980d12c58 Make references to ssid use a verbatim TtsSpan 
Bug: 20059794
Change-Id: Id92ef11e78547e168f55515dea2fc28519871d6f
 2015-06-15 10:07:55 -04:00
Geoff Mendal
991f0f6549 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-15 13:53:11 +00:00
Geoff Mendal
1649b7895b Import translations. DO NOT MERGE 
Change-Id: I2b7fd1100aca78ce28f084bcf94637ba1975b21e
Auto-generated-cl: translation import
 2015-06-15 08:51:34 -05:00
Geoff Mendal
8cacde1383 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-15 13:45:48 +00:00
Geoff Mendal
1ed87e5d30 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-15 13:44:46 +00:00
Geoff Mendal
007c215917 Import translations. DO NOT MERGE 
Change-Id: Id021d13867abfcb10e4fb1a9754ae21052f66ffb
Auto-generated-cl: translation import
 2015-06-15 08:43:30 -05:00
Geoff Mendal
ee4a297766 Import translations. DO NOT MERGE 
Change-Id: I7bb1d35595971e4d2ff83ba40c01524ed243d26d
Auto-generated-cl: translation import
 2015-06-15 08:39:05 -05:00
Paul Jensen
8a6025fdaf Merge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev 2015-06-15 13:35:48 +00:00
Chris Wren
b3c8564314 Merge "remove setLatestEventInfo from USB" into mnc-dev 2015-06-15 12:23:26 +00:00
Diego Perez
fa794eb002 am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev 
* commit '2f7103565cf1732d6d1281195cfa49a1564751d7':
  Fix for shadows on theme editor
 2015-06-15 10:14:30 +00:00
Diego Perez
40a216d959 am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev 
* commit 'df6f63badfe2572284dad8e34f152fd1c24a873e':
  Fix GcSnapshot drawInLayer when clipping is used.
 2015-06-15 10:14:24 +00:00
Diego Perez
2f7103565c am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev 
* commit '13c06d6c91e67962b7ffdf92c56e3b01125e4a8d':
  Fix for shadows on theme editor
 2015-06-15 10:04:02 +00:00
Diego Perez
df6f63badf am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev 
* commit '2422011d867f4d4516605148641bbeb7d9c2501b':
  Fix GcSnapshot drawInLayer when clipping is used.
 2015-06-15 10:03:58 +00:00
Diego Perez
13c06d6c91 am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev 
* commit '1f33bdad98dd5138f887642d39c9495e1d7df14b':
  Fix for shadows on theme editor
 2015-06-15 09:50:58 +00:00
Diego Perez
2422011d86 am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev 
* commit 'b2411c622cf9124f6af5f70d416adb179f9c88bb':
  Fix GcSnapshot drawInLayer when clipping is used.
 2015-06-15 09:50:51 +00:00
Diego Perez
1f33bdad98 am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev 
* commit '5e50e00c663a5d0b11d1f41509e1fb4e56d166f1':
  Fix for shadows on theme editor
 2015-06-15 09:36:39 +00:00
Diego Perez
b2411c622c am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev 
* commit 'ead59b0d479c3a911be87261b523255e8e51f76a':
  Fix GcSnapshot drawInLayer when clipping is used.
 2015-06-15 09:36:34 +00:00
Diego Perez
5e50e00c66 Merge "Fix for shadows on theme editor" into lmp-mr1-dev 2015-06-15 08:35:00 +00:00
Diego Perez
ead59b0d47 Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev 2015-06-15 08:34:04 +00:00
Jeff Sharkey
0463cad783 Maybe make strings happy? 
Bug: 21805255
Change-Id: I2e299a83b449aadc8e9a523fc4bbbf6f843f121d
 2015-06-14 21:18:10 -07:00
Jeff Sharkey
52fc3c0f73 Start using new storage strings. 
We have language for "unsupported" devices, and we're letting the
user snooze missing private volumes.

Bug: 21666225
Change-Id: I0bc17e6b854946036f02df5b4953b4344fa85a1f
 2015-06-14 20:58:57 -07:00
Svetoslav
6d9778328a Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev 2015-06-14 20:01:02 +00:00
Svet Ganov
a5c852e03a Merge "Clear runtime permissions on package data reset." into mnc-dev 2015-06-14 03:22:09 +00:00
Svet Ganov
2a30be1900 Clear runtime permissions on package data reset. 
bug:21817488

Change-Id: I7c51fee5206e3bcb79951f237a71862f0752a709
 2015-06-13 20:20:18 -07:00
Svet Ganov
715cf2ac0b Make AppOpsManager#permissionToOp API public 
We need this API to implement permission checker API
in the support lib that takes into account both app
ops and permissions.

bug:21277214

Change-Id: I684fc002bb71ec5e1cd2994098faa0d2036297ac
 2015-06-14 00:50:38 +00:00
Nick Kralevich
31b9c1721f Merge "UsbDeviceManager: Modify default function handling" into mnc-dev 2015-06-13 03:12:49 +00:00
Dirk Dougherty
c6d3342064 am 4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs 
* commit '4decc115ae4fc846fffda238569d6c55451a63af':
  Doc change: move ndk docs jd into main docs tree.
 2015-06-13 02:57:04 +00:00