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

183310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Solovay
456b0605c6 am 79d543eb: am d6f1fbe0: am 9ac09b6c: am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs 
* commit '79d543eb26e841c2d18a972adfcc4ad3fc1e8d75':
  docs: New "implementing app restrictions" doc
 2015-02-25 17:26:17 +00:00
Chris Craik
114763e916 am 40d8cd6f: am 7914fa5c: am 661b54ae: am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection 
* commit '40d8cd6ffa8febc6eab8a8690ace34a03b78e33a':
  Explain behavior of boundless ripple projection
 2015-02-25 17:26:07 +00:00
Geoff Mendal
c88604bcb9 am 6715b9dd: (-s ours) am bb463806: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '6715b9dda1ada0a71ddc8215bc9c050c76fb309d':
  Import translations. DO NOT MERGE
 2015-02-25 17:12:34 +00:00
Geoff Mendal
d170ff32c0 am 28e4a357: (-s ours) am c2cbbb89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '28e4a357ce341ccb535352708f241a098f22bbf5':
  Import translations. DO NOT MERGE
 2015-02-25 17:12:28 +00:00
Geoff Mendal
ed6db520b8 am 6d471d04: (-s ours) am a4f54454: (-s ours) Import translations. DO NOT MERGE 
* commit '6d471d04b086d6d21b2e01f2368ec02af36d9970':
  Import translations. DO NOT MERGE
 2015-02-25 17:12:23 +00:00
Geoff Mendal
336beed4d1 am aee4a86a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'aee4a86a049c8c427a5b5f2d0d8ab0e6be520f00':
  Import translations. DO NOT MERGE
 2015-02-25 17:12:00 +00:00
Geoff Mendal
9d695da885 am ce64b99e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'ce64b99e4478f047ff871078e2ad64d4c4818529':
  Import translations. DO NOT MERGE
 2015-02-25 17:11:54 +00:00
Geoff Mendal
dd535604fc am 53ddd69e: (-s ours) Import translations. DO NOT MERGE 
* commit '53ddd69ea737a20541735bce28b950feeab2d0a8':
  Import translations. DO NOT MERGE
 2015-02-25 17:11:49 +00:00
Joe Fernandez
20928caef4 am 4e3e6fb1: am 9afbbb2e: am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs 
* commit '4e3e6fb16e091815bee4a0be657f462a9f0e4229':
  docs: Android for Work developer landing page
 2015-02-25 17:11:17 +00:00
Andrew Solovay
3999d0fdd7 am 2557fb07: am d7cddbd2: am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller 
* commit '2557fb070a54a65277c320f20cedde828febb1e2':
  docs: New doc for creating an AfW Work Policy Controller
 2015-02-25 17:11:11 +00:00
Andrew Solovay
79d543eb26 am d6f1fbe0: am 9ac09b6c: am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs 
* commit 'd6f1fbe04cd7e099c1fa95967c1b7ddfad8669d3':
  docs: New "implementing app restrictions" doc
 2015-02-25 17:11:05 +00:00
Chris Craik
40d8cd6ffa am 7914fa5c: am 661b54ae: am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection 
* commit '7914fa5ce6c521d4aa7b16a37a2f2df9263b123b':
  Explain behavior of boundless ripple projection
 2015-02-25 17:10:59 +00:00
John Spurlock
864908620e AudioService: Use the foreground broadcast queue for fired intents. 
Minimize delay for receivers, assume they are providing volume UI.

Change-Id: I054bac4292ad7c608cd46543409595dcea6a7731
 2015-02-25 11:22:52 -05:00
Geoff Mendal
6715b9dda1 am bb463806: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'bb463806aa9a83d10cfff5f565eebd71d500ae4e':
  Import translations. DO NOT MERGE
 2015-02-25 15:47:38 +00:00
Wale Ogunwale
cdd35e6776 Merge "Revert "Have AMS.setFocusedActivityLocked() move the focus stack to the front"" 2015-02-25 15:41:53 +00:00
Geoff Mendal
bb463806aa Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-02-25 15:41:24 +00:00
Geoff Mendal
70228b3929 Import translations. DO NOT MERGE 
Change-Id: I4e5b922995cf7eff9c984735209e2fe073fb5d83
Auto-generated-cl: translation import
 2015-02-25 07:39:28 -08:00
Wale Ogunwale
3426b72cff Revert "Have AMS.setFocusedActivityLocked() move the focus stack to the front" 
This reverts commit af0e44885992b0675d7881c391caeff88414695f.

Unblock the release while I figure-out how the change broke things...

Bug: 19505341
Bug: 19507107
 2015-02-25 15:39:06 +00:00
Geoff Mendal
2486f38ad8 Merge "Import translations. DO NOT MERGE" 2015-02-25 15:35:23 +00:00
Geoff Mendal
01dd864ec0 Import translations. DO NOT MERGE 
Change-Id: Ie511cef0bf2d54e3ca9064a2391955b2cf301ddd
Auto-generated-cl: translation import
 2015-02-25 07:33:55 -08:00
Geoff Mendal
bfd3d52867 Merge "Import translations. DO NOT MERGE" 2015-02-25 15:04:42 +00:00
Geoff Mendal
84df2801d4 Import translations. DO NOT MERGE 
Change-Id: I897dff4093f9cce29524a64a9cc4fc08a6655e57
Auto-generated-cl: translation import
 2015-02-25 07:01:14 -08:00
Geoff Mendal
7e90606c69 Merge "Import translations. DO NOT MERGE" 2015-02-25 14:53:13 +00:00
Geoff Mendal
8c010dcaee Import translations. DO NOT MERGE 
Change-Id: Iaf416dc2326ddaf2601b5c37d0e86b2b6fb8e307
Auto-generated-cl: translation import
 2015-02-25 06:46:25 -08:00
Geoff Mendal
ec9382b46d Merge "Import translations. DO NOT MERGE" 2015-02-25 14:42:56 +00:00
Geoff Mendal
7a57388962 Import translations. DO NOT MERGE 
Change-Id: I5e23004d3660fc0ce296391f908e6a042e8da16d
Auto-generated-cl: translation import
 2015-02-25 06:40:41 -08:00
Geoff Mendal
e4bf2eea03 Import translations. DO NOT MERGE 
Change-Id: If17993f8a25da1cb9a868150bb787d8c1b9810bd
Auto-generated-cl: translation import
 2015-02-25 06:25:08 -08:00
Geoff Mendal
28e4a357ce am c2cbbb89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'c2cbbb89061d45dfe4ec84c3bf5304e76ac6ef64':
  Import translations. DO NOT MERGE
 2015-02-25 14:13:06 +00:00
Geoff Mendal
6d471d04b0 am a4f54454: (-s ours) Import translations. DO NOT MERGE 
* commit 'a4f544540ebe27aca15305dd8f5bda5b5d10283b':
  Import translations. DO NOT MERGE
 2015-02-25 14:13:00 +00:00
Geoff Mendal
c2cbbb8906 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-02-25 14:09:55 +00:00
Geoff Mendal
ecac2cb4d2 Import translations. DO NOT MERGE 
Change-Id: I84339eebbf7a8e2332e85a104b85ec740a25d6f1
Auto-generated-cl: translation import
 2015-02-25 06:08:29 -08:00
Geoff Mendal
a4f544540e Import translations. DO NOT MERGE 
Change-Id: I5974f01d8313faa999068ffd844ecbafb9ab4321
Auto-generated-cl: translation import
 2015-02-25 06:02:34 -08:00
Geoff Mendal
aee4a86a04 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-25 13:45:21 +00:00
Geoff Mendal
ce64b99e44 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-25 13:44:55 +00:00
Geoff Mendal
91d95328da Import translations. DO NOT MERGE 
Change-Id: I077436f56f383af0746ee1c7037ba8bef0d1d6d6
Auto-generated-cl: translation import
 2015-02-25 07:41:18 -06:00
Geoff Mendal
5d7482adc1 Import translations. DO NOT MERGE 
Change-Id: Ib4c512a4856bdce8518bf1ee1a36ca5fc19a324b
Auto-generated-cl: translation import
 2015-02-25 05:41:09 -08:00
Geoff Mendal
53ddd69ea7 Import translations. DO NOT MERGE 
Change-Id: I14e100832a693f7e5cfa8d53edd90ebb1745c064
Auto-generated-cl: translation import
 2015-02-25 05:35:06 -08:00
Joe Fernandez
4e3e6fb16e am 9afbbb2e: am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs 
* commit '9afbbb2e600936ef7a402fecd0402a3e59cf864e':
  docs: Android for Work developer landing page
 2015-02-25 13:27:07 +00:00
Adrian Roos
e377c5011f Merge "Prevent regular processes from accessing the password history" 2015-02-25 13:27:05 +00:00
Andrew Solovay
2557fb070a am d7cddbd2: am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller 
* commit 'd7cddbd2d595cd5ee2cb9e7e05af8a760f265f84':
  docs: New doc for creating an AfW Work Policy Controller
 2015-02-25 13:27:03 +00:00
Andrew Solovay
d6f1fbe04c am 9ac09b6c: am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs 
* commit '9ac09b6c553060d0104aa8fb3f38f4dfd81a8957':
  docs: New "implementing app restrictions" doc
 2015-02-25 13:26:58 +00:00
Chris Craik
7914fa5ce6 am 661b54ae: am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection 
* commit '661b54ae2a55461aa70c07d069550b911c14f800':
  Explain behavior of boundless ripple projection
 2015-02-25 13:26:53 +00:00
Joe Fernandez
9afbbb2e60 am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs 
* commit '8ffb574a5087b2099cef5f629568375caa0ddc9c':
  docs: Android for Work developer landing page
 2015-02-25 13:16:20 +00:00
Andrew Solovay
d7cddbd2d5 am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller 
* commit '7391b0a177f9ecf3c8e3a9657bbf1ae7000ce528':
  docs: New doc for creating an AfW Work Policy Controller
 2015-02-25 13:16:15 +00:00
Andrew Solovay
9ac09b6c55 am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs 
* commit '93df7f0740a6d2044c29227ac6f684c74aa49ff7':
  docs: New "implementing app restrictions" doc
 2015-02-25 13:16:11 +00:00
Chris Craik
661b54ae2a am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection 
* commit '7fc5b5a129a3599c4a213117415e113a85d09745':
  Explain behavior of boundless ripple projection
 2015-02-25 13:16:06 +00:00
Joe Fernandez
8ffb574a50 am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs 
* commit 'f7224396ee8416630b9387995a79faae1ee68b7c':
  docs: Android for Work developer landing page
 2015-02-25 13:09:56 +00:00
Andrew Solovay
7391b0a177 am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller 
* commit 'e64301e639e73f346a78584af2727bc98f3d81ae':
  docs: New doc for creating an AfW Work Policy Controller
 2015-02-25 13:09:33 +00:00
Andrew Solovay
93df7f0740 am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs 
* commit '032e931a806d21d5fa190d1d28f8d65ee0fb4926':
  docs: New "implementing app restrictions" doc
 2015-02-25 13:09:29 +00:00
Chris Craik
7fc5b5a129 am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection 
* commit 'a9ad0fc793e3479e678441f2ed7abd47994ab74d':
  Explain behavior of boundless ripple projection
 2015-02-25 13:09:24 +00:00