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

163916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Prashant Malani
a98c21a662 Make circular mask thickness configurable 
Obtain the circular mask thickness as a dimension so that it can
be customized per-device.

Change-Id: Ied88f91424c5cf4f25dd1e78cf22f0fd7ea7b0a4
Signed-off-by: Prashant Malani <pmalani@google.com>
 2015-03-11 00:34:15 +00:00
Justin Koh
dff0fdb417 Merge "Add translatable=false to dozeComponent" into lmp-mr1-modular-dev 2015-03-10 20:37:06 +00:00
Justin Koh
ba6cff0de7 Add translatable=false to dozeComponent 
Add translatable=false to dozeComponent: this prevents it from breaking with
en_XA pseudolocalization.

Change-Id: I53a77d8590c65189633b89fed67d247115e75df9
 2015-03-10 13:12:51 -07:00
Mark Renouf
cc2212d2ee Merge "Adds system property for developer option for force-enable burn-in protection" into lmp-mr1-modular-dev 2015-03-10 16:38:54 +00:00
Rich Slogar
1d0b0edd30 am ccc24997: am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev 
* commit 'ccc24997a37a7ee96b80f4dc4f43ea52d2c2cd46':
  docs: build tools revision 22.0.0:
 2015-03-10 15:08:58 +00:00
Rich Slogar
ccc24997a3 am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev 
* commit '464a2bc261ac3b3ad817e3d5cc7fa8f3dae0a6c3':
  docs: build tools revision 22.0.0:
 2015-03-10 01:31:03 +00:00
Rich Slogar
464a2bc261 Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev 2015-03-09 23:42:48 +00:00
Rich Slogar
5427ac7147 am 282099b5: am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs 
* commit '282099b57f23814a95128e37bdb5a5a1971ede67':
  docs: android plugin for gradle release 1.1.3 release notes
 2015-03-09 19:59:42 +00:00
Rich Slogar
282099b57f am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs 
* commit '5a604b359cd487d4a01a397e49117d22848e6809':
  docs: android plugin for gradle release 1.1.3 release notes
 2015-03-09 19:53:48 +00:00
Rich Slogar
5a604b359c am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs 
* commit '00e3efb549274ac381c95e359611ce7dcc9542cc':
  docs: android plugin for gradle release 1.1.3 release notes
 2015-03-09 19:47:18 +00:00
Rich Slogar
00e3efb549 am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs 
* commit 'f51020eaaaff9f54cee1ba91ab35d0212ddb0f54':
  docs: android plugin for gradle release 1.1.3 release notes
 2015-03-09 19:40:48 +00:00
Rich Slogar
f51020eaaa am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs 
* commit '6e1cbe43957b18f471f82682b5df999578230230':
  docs: android plugin for gradle release 1.1.3 release notes
 2015-03-09 19:34:32 +00:00
Rich Slogar
6e1cbe4395 Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs 2015-03-09 19:29:37 +00:00
Luan Nguyen
a05634ffd9 am 408800c3: am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs 
* commit '408800c3aca72d150dacb646d0a455b248fc3db0':
  docs: Add new partners to Wear index page
 2015-03-09 18:03:19 +00:00
Luan Nguyen
408800c3ac am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs 
* commit 'ea9308cf6b95858ef4f16222ebb8809621b801ae':
  docs: Add new partners to Wear index page
 2015-03-09 17:54:58 +00:00
Rich Slogar
24387bf7ab docs: build tools revision 22.0.0: 
Change-Id: Idcc00e2fb0f30c54f28ad0c12c6fb014df681e76
 2015-03-09 10:31:02 -07:00
Geoff Mendal
535bf0f8e5 am d7852b66: (-s ours) Import translations. DO NOT MERGE 
* commit 'd7852b66abfecf2de4422f92a8ebc5681082ecaf':
  Import translations. DO NOT MERGE
 2015-03-09 15:45:18 +00:00
Eric Gilmore
bcea1fcd45 am f1eab6f5: am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs 
* commit 'f1eab6f5d82e669b654d185b88ba94b4cff3689c':
  Reworking geofencing training to new API and sample.
 2015-03-09 15:45:03 +00:00
Glenn Kasten
e442d914b8 am ad97ca81: am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos 
* commit 'ad97ca8188f246c9c902f42749b93fd67b93aee2':
  Fix USB typos
 2015-03-09 15:44:52 +00:00
Luan Nguyen
ea9308cf6b am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs 
* commit 'a9639fe619591888fcc97475de15a55017dd1ff7':
  docs: Add new partners to Wear index page
 2015-03-09 15:05:44 +00:00
Luan Nguyen
a9639fe619 am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs 
* commit '2fcc438f765789e1786cdfe612f61b034ad7344b':
  docs: Add new partners to Wear index page
 2015-03-09 14:59:12 +00:00
Luan Nguyen
2fcc438f76 am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs 
* commit '6a96a77814a89836ba0a85335479c6b3ea9aec33':
  docs: Add new partners to Wear index page
 2015-03-09 14:52:45 +00:00
Luan Nguyen
6a96a77814 Merge "docs: Add new partners to Wear index page" into lmp-docs 2015-03-09 14:47:33 +00:00
Geoff Mendal
d7852b66ab Import translations. DO NOT MERGE 
Change-Id: I5057e9ae3a255e9315967eae49f71c862fd53290
Auto-generated-cl: translation import
 2015-03-09 05:56:54 -07:00
Geoff Mendal
146990b749 Import translations. DO NOT MERGE 
Change-Id: I9679db5505c907b78d3d97585d061f6746b0af7f
Auto-generated-cl: translation import
 2015-03-09 05:34:56 -07:00
Rich Slogar
d5322338d8 docs: android plugin for gradle release 1.1.3 release notes 
Change-Id: If7ee333e83e0be60c864021e068f024694eb3dd1
 2015-03-06 16:17:56 -08:00
Bryce Lee
8aeab6c8b9 Allow the keyguard service to be configurable. 
Change-Id: I811171c228764c3e0e507ad3ce28835ccad9bb31
 2015-03-06 15:21:46 -08:00
Bryce Lee
1e53b98c38 Merge "Allow press and hold from non-interactive." into lmp-mr1-modular-dev 2015-03-06 20:41:13 +00:00
Eric Gilmore
f1eab6f5d8 am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs 
* commit '39d47c7c709cd2417f8a0a7849ed6da8eb83caa3':
  Reworking geofencing training to new API and sample.
 2015-03-06 19:39:52 +00:00
Eric Gilmore
39d47c7c70 am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs 
* commit 'a2d342e374b6c3152695ad0761a2bdb96be2d8c4':
  Reworking geofencing training to new API and sample.
 2015-03-06 19:33:51 +00:00
Eric Gilmore
a2d342e374 am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs 
* commit 'beed93320633a0c460952eaa91a61a1d186e390a':
  Reworking geofencing training to new API and sample.
 2015-03-06 19:27:14 +00:00
Eric Gilmore
beed933206 am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs 
* commit '0bceaacf4221a5b302d12fc085744bb54cbbdd6e':
  Reworking geofencing training to new API and sample.
 2015-03-06 19:20:45 +00:00
Eric Gilmore
0bceaacf42 Merge "Reworking geofencing training to new API and sample." into lmp-docs 2015-03-06 19:14:28 +00:00
Eric Gilmore
a0e3eb7ba2 Reworking geofencing training to new API and sample. 
Change-Id: Ibc9e2561cd93e73eab87a78f4aabe64ae9c8a0b3
 2015-03-06 10:50:59 -08:00
Glenn Kasten
ad97ca8188 am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos 
* commit '4c0b23453c35581bdcc5738d047d90c2b56cb3ee':
  Fix USB typos
 2015-03-06 16:45:31 +00:00
Glenn Kasten
4c0b23453c am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos 
* commit '8f9ae2323e747dfbc09b48c6e29edcffaca4d0c7':
  Fix USB typos
 2015-03-06 16:38:48 +00:00
Glenn Kasten
8f9ae2323e am 36d008c5: am 5afdc97f: Fix USB typos 
* commit '36d008c5aea036e4c2e62dd8d5453ada72dcdea0':
  Fix USB typos
 2015-03-06 16:32:39 +00:00
Glenn Kasten
36d008c5ae am 5afdc97f: Fix USB typos 
* commit '5afdc97f2e41845e7ddf512814771d4cdf134171':
  Fix USB typos
 2015-03-06 16:25:58 +00:00
Glenn Kasten
5afdc97f2e Fix USB typos 
Change-Id: Iefa610a81e9155dcfc687c514611bb7dbba5d7f9
(cherry picked from commit 9e86f6139b62dbc87b7ea97cedf847c847657829)
 2015-03-06 16:15:15 +00:00
Dan Sandler
8deb6d95a7 am e6a4b445: am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev 
* commit 'e6a4b445944489d67d40c8f52322fb149290fcf8':
  Avoid crashing on startup when policy forbids lockscreen camera.
 2015-03-06 00:21:47 +00:00
Dan Sandler
e6a4b44594 am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev 
* commit '3581f4c91a77ecb9313f51a2d07ed88ff61d9299':
  Avoid crashing on startup when policy forbids lockscreen camera.
 2015-03-06 00:10:22 +00:00
Dan Sandler
3581f4c91a Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev 2015-03-06 00:03:37 +00:00
Eric Gilmore
6e3c763f01 am 685e6ce8: am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs 
* commit '685e6ce830f97383846335eec758e83ba3ad7060':
  Re-fixing link, and removing trailing white space.
 2015-03-05 23:26:17 +00:00
Eric Gilmore
685e6ce830 am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs 
* commit '636a39babbda97743b33511b3dd2addafc8c2847':
  Re-fixing link, and removing trailing white space.
 2015-03-05 23:11:09 +00:00
Eric Gilmore
636a39babb am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs 
* commit 'e95fa2649b62a3fbccd096b43925a17c6ff03228':
  Re-fixing link, and removing trailing white space.
 2015-03-05 23:04:27 +00:00
Eric Gilmore
e95fa2649b am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs 
* commit 'e17b0a14ccc427bff386517537fcf23e00a087d4':
  Re-fixing link, and removing trailing white space.
 2015-03-05 22:50:16 +00:00
Eric Gilmore
e17b0a14cc am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs 
* commit '87499b275bc7a8d4a12a3134646769a5c6c34829':
  Re-fixing link, and removing trailing white space.
 2015-03-05 22:34:58 +00:00
Eric Gilmore
87499b275b Merge "Re-fixing link, and removing trailing white space." into lmp-docs 2015-03-05 22:00:22 +00:00
Eric Gilmore
08134e649d Re-fixing link, and removing trailing white space. 
Change-Id: Ic6cef9862424d5581cf0ad5b8366c7033a9fdd93
 2015-03-05 13:39:21 -08:00
Rich Slogar
2847fc9912 am cfb0978f: am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix 
* commit 'cfb0978fd9a6bf8fa06dee061df03fccf20fabc4':
  docs: sdk tools date fix
 2015-03-05 19:59:55 +00:00