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

194092 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
fb5dae3024 am 8141d6e1: Merge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev 
* commit '8141d6e1509a586e2954fbece04e64aaa02092a2':
  Use DeviceDefault (dark) theme for PrintActivity
 2015-05-27 20:23:30 +00:00
Chris Craik
455152bce2 am 1ec5e308: Merge "Fix assert when dumping view at 0 alpha" into mnc-dev 
* commit '1ec5e308a913cd0c54d58fd797274485664781c1':
  Fix assert when dumping view at 0 alpha
 2015-05-27 20:23:23 +00:00
Chris Craik
b6483c5e73 am 1e6d566c: Merge "Fix GL texture binding for TextureViews" into mnc-dev 
* commit '1e6d566c5f8500e3639a8f8ceebf0226c07efc13':
  Fix GL texture binding for TextureViews
 2015-05-27 20:23:18 +00:00
Alex Klyubin
9e3743e82c am 06c88b60: Merge "Fix typo in Javadocs of KeyGenParameterSpec." into mnc-dev 
* commit '06c88b60efd12d3e81c7a9c53d8b995e23d04c5a':
  Fix typo in Javadocs of KeyGenParameterSpec.
 2015-05-27 20:23:14 +00:00
Andres Morales
838cd2e467 am 5ccfe51d: Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev 
* commit '5ccfe51d8b9ae4f73a3b0fdb553b807cf5691582':
  [LockSettings] migrate password attempt throttling to hardware
 2015-05-27 20:23:05 +00:00
Julia Reynolds
bd24ba1819 am 77aa9afe: Merge "Fallback to priority activity if preferred activity not available." into mnc-dev 
* commit '77aa9afe0c67ca7285ed81664571f3d6f567eb9b':
  Fallback to priority activity if preferred activity not available.
 2015-05-27 20:22:59 +00:00
Alan Viverette
d3972f39b8 am d0699fa5: Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev 
* commit 'd0699fa5697ba43c64c142ee67b245e0a346acfe':
  Avoid strict mode violation during saveAttributeData
 2015-05-27 20:22:55 +00:00
Alan Viverette
8141d6e150 Merge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev 2015-05-27 19:26:27 +00:00
Chris Craik
1ec5e308a9 Merge "Fix assert when dumping view at 0 alpha" into mnc-dev 2015-05-27 19:22:59 +00:00
Chris Craik
1e6d566c5f Merge "Fix GL texture binding for TextureViews" into mnc-dev 2015-05-27 19:22:44 +00:00
Alan Viverette
7e59bb70a6 Use DeviceDefault (dark) theme for PrintActivity 
Bug: 21433656
Change-Id: If90ba72fb5862f0eb583c8e64642920c49c5fea6
 2015-05-27 12:17:26 -07:00
Alex Klyubin
06c88b60ef Merge "Fix typo in Javadocs of KeyGenParameterSpec." into mnc-dev 2015-05-27 18:46:56 +00:00
Andres Morales
5ccfe51d8b Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev 2015-05-27 18:37:32 +00:00
Julia Reynolds
77aa9afe0c Merge "Fallback to priority activity if preferred activity not available." into mnc-dev 2015-05-27 18:28:42 +00:00
Chris Craik
43a1d31a28 Fix assert when dumping view at 0 alpha 
bug:21461177

Change-Id: Ib4aba7b9641254012471da44aa804813b9679423
 2015-05-27 11:28:15 -07:00
Chris Craik
5f1356c80a Fix GL texture binding for TextureViews 
bug:21431334

Should be explicitly passing target through, to ensure
GL_EXTERNAL_OES textures are bound correctly.

Change-Id: I997672ae292ea7fc016c02a59a3c7c8358ecfe0b
 2015-05-27 11:06:22 -07:00
Cedric Ho
b343bfd95a am 2b919d4f: Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev 
* commit '2b919d4f69807528a11e38aee1a87507249d8319':
  Add getCallingUid() to RecognitionService.Callback.
 2015-05-27 18:01:09 +00:00
Alan Viverette
d0699fa569 Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev 2015-05-27 18:00:18 +00:00
Cedric Ho
2b919d4f69 Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev 2015-05-27 17:46:41 +00:00
John Reck
89745e6f45 am 302abd22: Merge "Enable swapBuffersWithDamage by default" into mnc-dev 
* commit '302abd22468367bcdeb1f85ea8014fe05ed95610':
  Enable swapBuffersWithDamage by default
 2015-05-27 17:42:56 +00:00
Alan Viverette
1ed681dd2a am 165229ba: Merge "Add workaround for measuring stacked button bar layout" into mnc-dev 
* commit '165229ba417fd77ccbb4feb3bc3c664d2cac7ce5':
  Add workaround for measuring stacked button bar layout
 2015-05-27 17:42:52 +00:00
John Reck
302abd2246 Merge "Enable swapBuffersWithDamage by default" into mnc-dev 2015-05-27 17:39:18 +00:00
Alan Viverette
165229ba41 Merge "Add workaround for measuring stacked button bar layout" into mnc-dev 2015-05-27 17:30:45 +00:00
John Reck
4cd44f8110 Enable swapBuffersWithDamage by default 
Bug: 20761426

Change-Id: I520e60ca4f182dea590bc86eebd522e1db7a018a
 2015-05-27 10:28:28 -07:00
Alan Viverette
cffaf7e7e4 Add workaround for measuring stacked button bar layout 
Bug: 21300645
Change-Id: If9544da4995c3dce118dd9e36d42764662b3aecd
 2015-05-27 10:28:05 -07:00
Geoff Mendal
f509067dfe am 07491cb9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '07491cb93c66c0f4a1680dc07eca22dab5455c12':
  Import translations. DO NOT MERGE
 2015-05-27 16:54:23 +00:00
Cedric Ho
8fedcdad36 Add getCallingUid() to RecognitionService.Callback. 
Change-Id: I596471625eee24ec93d08650c33461d35ad0aa07
 2015-05-27 09:51:19 -07:00
Geoff Mendal
07491cb93c Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-27 16:41:18 +00:00
Geoff Mendal
27ec560356 Import translations. DO NOT MERGE 
Change-Id: I75401e1e66e9793ea4be891b4ef6afcf9811184a
Auto-generated-cl: translation import
 2015-05-27 09:35:53 -07:00
Mike Colagrosso
222a345c96 am 6ffab1bd: am f77b748c: am 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs 
* commit '6ffab1bd65d2b5cc9e2944712058cb42babaa76b':
  Android Training: Add missing word
 2015-05-27 16:24:27 +00:00
Mike Colagrosso
6ffab1bd65 am f77b748c: am 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs 
* commit 'f77b748caa2795296866c1c9c30385819ffca835':
  Android Training: Add missing word
 2015-05-27 16:06:48 +00:00
Mike Colagrosso
f77b748caa am 31a48820: am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs 
* commit '31a48820aa858770cb1f1b3ce32a550565c83546':
  Android Training: Add missing word
 2015-05-27 15:53:03 +00:00
Mike Colagrosso
31a48820aa am 1c673f9a: am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs 
* commit '1c673f9abe8b6d931456ce6709c9b00cdb5d11ca':
  Android Training: Add missing word
 2015-05-27 15:38:37 +00:00
Mike Colagrosso
1c673f9abe am 6eea30c4: Merge "Android Training: Add missing word" into lmp-docs 
* commit '6eea30c422811da1b989500147afb82b5f2d45e0':
  Android Training: Add missing word
 2015-05-27 15:23:36 +00:00
Mike Colagrosso
6eea30c422 Merge "Android Training: Add missing word" into lmp-docs 2015-05-27 15:04:48 +00:00
Julia Reynolds
843f648c82 Fallback to priority activity if preferred activity not available. 
Bug: 21434199
Change-Id: I1f268700219dea7f9ed02bda320923f49a5a3457
 2015-05-27 09:02:18 -04:00
Sudheer Shanka
056e1d7756 am 81c73e12: Merge "Clear caller identity before setting all the user restrictions." into mnc-dev 
* commit '81c73e121ef2ff44a3916628d9ff11385db85bd6':
  Clear caller identity before setting all the user restrictions.
 2015-05-27 11:34:19 +00:00
Sudheer Shanka
81c73e121e Merge "Clear caller identity before setting all the user restrictions." into mnc-dev 2015-05-27 11:25:33 +00:00
Wale Ogunwale
83d9c9fd67 am 0f22ec97: am 21531bce: am 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS 
* commit '0f22ec9777d94c39364d340b454e99c44cac7d9a':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
 2015-05-27 06:35:01 +00:00
Wale Ogunwale
0f22ec9777 am 21531bce: am 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS 
* commit '21531bce0e8848311c7f8caceeee3b988c7396f4':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
 2015-05-27 06:21:15 +00:00
Wale Ogunwale
21531bce0e am 57141700: am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS 
* commit '5714170091065bb51f33c8f3ce272db07f69a21b':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
 2015-05-27 06:06:51 +00:00
Wale Ogunwale
5714170091 am 0f771240: am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS 
* commit '0f7712407d96a847845b10eef34d9a259c687533':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
 2015-05-27 05:52:33 +00:00
Wale Ogunwale
0f7712407d am bf0439a7: am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS 
* commit 'bf0439a7e8824b4288f52c952a6808c8bdaf3235':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
 2015-05-27 05:35:52 +00:00
Johan Euphrosine
505ef51572 am 625119f3: am 54856cc7: am a08a26c6: Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs 
* commit '625119f369ace53851f6042506a8d31c2c13cbd6':
  frameworks/base/docs/ndk: add files in reference_toc
 2015-05-27 05:26:17 +00:00
Wale Ogunwale
bf0439a7e8 am 02f3cf79: am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS 
* commit '02f3cf79989b202a45753ad74653d48f7d73c73d':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
 2015-05-27 05:17:55 +00:00
Johan Euphrosine
625119f369 am 54856cc7: am a08a26c6: Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs 
* commit '54856cc75f5dbbfa18aa0f84b69fbcaad7c25cc4':
  frameworks/base/docs/ndk: add files in reference_toc
 2015-05-27 05:10:27 +00:00
Wale Ogunwale
02f3cf7998 am 523a19bf: am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS 
* commit '523a19bf3df202c58369279fc4e538e9e342c1e7':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
 2015-05-27 05:03:29 +00:00
Johan Euphrosine
54856cc75f am a08a26c6: Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs 
* commit 'a08a26c661d8cd31f3465ff8fa7356bcdad996a8':
  frameworks/base/docs/ndk: add files in reference_toc
 2015-05-27 04:57:05 +00:00
Wale Ogunwale
523a19bf3d am c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS 
* commit 'c9a0c0b90773fded6c251646300231f67c891b78':
  Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
 2015-05-27 04:50:11 +00:00
Johan Euphrosine
a08a26c661 Merge "frameworks/base/docs/ndk: add files in reference_toc" into mnc-preview-docs 2015-05-27 04:43:22 +00:00