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

209038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve McKay
825324369a Improved files icon and activity label. 
Change-Id: I7df661b88ce859f94d5f0bbd6687950140cbf39d
 2015-07-27 12:03:26 -07:00
Steve McKay
e74fff48a0 Merge "Clear selection when empty space is tapped." 2015-07-27 18:39:30 +00:00
Tim Volodine
e7dca53477 am 765fed14: am cd183953: am 15a4320e: am 2f6d6742: am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev 
* commit '765fed146cf36322f7167187081091953632a59a':
  Revert "Invoke geolocation permissions callback with denied state by default."
 2015-07-27 18:35:51 +00:00
Steve McKay
b04b1648c5 Clear selection when empty space is tapped. 
Change-Id: I37f3ce8ec8d6b4c69a990ad129ff37229a8d2ac2
 2015-07-27 11:25:25 -07:00
Tim Volodine
765fed146c am cd183953: am 15a4320e: am 2f6d6742: am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev 
* commit 'cd1839538f83b371716579b895bfadb1fda43dc9':
  Revert "Invoke geolocation permissions callback with denied state by default."
 2015-07-27 18:19:02 +00:00
Tim Volodine
cd1839538f am 15a4320e: am 2f6d6742: am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev 
* commit '15a4320e731775163d5297ec20d031d9af4928d3':
  Revert "Invoke geolocation permissions callback with denied state by default."
 2015-07-27 18:05:57 +00:00
Tim Volodine
15a4320e73 am 2f6d6742: am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev 
* commit '2f6d674256cde89008c4457998b70d27721cdc64':
  Revert "Invoke geolocation permissions callback with denied state by default."
 2015-07-27 17:14:01 +00:00
Tim Volodine
2f6d674256 am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev 
* commit '91b31b53127aafbf3ed34b98f405d6e750627050':
  Revert "Invoke geolocation permissions callback with denied state by default."
 2015-07-27 16:57:07 +00:00
Tim Volodine
91b31b5312 Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev 2015-07-27 16:37:57 +00:00
Tim Volodine
4961105a7d Revert "Invoke geolocation permissions callback with denied state by default." 
This reverts commit 954d1333c478d4dba6c9a0536510da4fd94c0622.

The revert is due to apps calling super.onGeolocationPermissionsShowPrompt see b/22685046

Bug: 22685046
Change-Id: I2a9f42b432a010828a0cafaee064480bb0f91cbe
(cherry picked from commit 0bb7d2e46710932d09688a18d4c5836f9b1413a5)
 2015-07-27 16:20:29 +00:00
George Mount
853a5c7b64 am 0ec20e2c: am ec25318a: am 931aaefd: am d7ecca5b: am 9c450936: am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs 
* commit '0ec20e2cabbb369119c08ac4b7f51018cc69e2ed':
  Update data binding for RC1.
 2015-07-27 15:54:25 +00:00
George Mount
71576bddd0 am c8f7311a: (-s ours) am 5fea0488: (-s ours) am 457b283e: (-s ours) am aedc09fb: (-s ours) am c0231f26: (-s ours) am a29cfefe: (-s ours) am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs 
* commit 'c8f7311abcc08d4517e56d5031a061f33ed7c318':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
 2015-07-27 15:54:19 +00:00
George Mount
0ec20e2cab am ec25318a: am 931aaefd: am d7ecca5b: am 9c450936: am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs 
* commit 'ec25318a128f890ae6149c9d59a59779c81e5b2c':
  Update data binding for RC1.
 2015-07-27 15:42:07 +00:00
George Mount
c8f7311abc am 5fea0488: (-s ours) am 457b283e: (-s ours) am aedc09fb: (-s ours) am c0231f26: (-s ours) am a29cfefe: (-s ours) am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs 
* commit '5fea04886d9bf5ada35bbdd540ffd942050de5cc':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
 2015-07-27 15:42:02 +00:00
George Mount
ec25318a12 am 931aaefd: am d7ecca5b: am 9c450936: am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs 
* commit '931aaefd753a7975acf0c71bc45bd9d746fee131':
  Update data binding for RC1.
 2015-07-27 15:28:38 +00:00
George Mount
5fea04886d am 457b283e: (-s ours) am aedc09fb: (-s ours) am c0231f26: (-s ours) am a29cfefe: (-s ours) am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs 
* commit '457b283e170d7ef7d56821065c71792398fa7cb3':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
 2015-07-27 15:28:33 +00:00
George Mount
931aaefd75 am d7ecca5b: am 9c450936: am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs 
* commit 'd7ecca5b1c83deb820b6305121a0e016a88b763f':
  Update data binding for RC1.
 2015-07-27 15:16:33 +00:00
George Mount
457b283e17 am aedc09fb: (-s ours) am c0231f26: (-s ours) am a29cfefe: (-s ours) am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs 
* commit 'aedc09fb88dc81a25c5d7b3b474ca112960d740c':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
 2015-07-27 15:16:29 +00:00
George Mount
d7ecca5b1c am 9c450936: am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs 
* commit '9c450936aad92920215d2bc52d2c9ce132a55432':
  Update data binding for RC1.
 2015-07-27 15:02:38 +00:00
George Mount
aedc09fb88 am c0231f26: (-s ours) am a29cfefe: (-s ours) am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs 
* commit 'c0231f26fe9ba13c3facb6caf42e53bae261654c':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
 2015-07-27 15:02:35 +00:00
George Mount
9c450936aa am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs 
* commit 'c571a9a1d026cbf262cf36a5348f99d1ca0ec835':
  Update data binding for RC1.
 2015-07-27 14:49:16 +00:00
George Mount
c0231f26fe am a29cfefe: (-s ours) am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs 
* commit 'a29cfefe2c157a28b256771b1dce4653d405dcf1':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
 2015-07-27 14:49:11 +00:00
Geoff Mendal
4e3f444adf am 924319c2: (-s ours) am 85518411: (-s ours) am 3a5edd9f: (-s ours) am 4cd6da53: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '924319c2e5bd09a95685ef10bb2eb8b15ad07e58':
  Import translations. DO NOT MERGE
 2015-07-27 14:42:45 +00:00
George Mount
c571a9a1d0 am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs 
* commit '6397ae6a0aedb8c7d085bb8907fc46a0e5bd7065':
  Update data binding for RC1.
 2015-07-27 14:35:50 +00:00
George Mount
a29cfefe2c am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs 
* commit '95e6ae3ad1ba8647494f0b5007b7beee76493e03':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
 2015-07-27 14:35:45 +00:00
Geoff Mendal
924319c2e5 am 85518411: (-s ours) am 3a5edd9f: (-s ours) am 4cd6da53: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '855184113cfd367c7b4d5700bf342ad9141e988e':
  Import translations. DO NOT MERGE
 2015-07-27 14:29:09 +00:00
George Mount
6397ae6a0a Merge "Update data binding for RC1." into mnc-preview-docs 2015-07-27 14:24:34 +00:00
George Mount
95e6ae3ad1 Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs 2015-07-27 14:24:17 +00:00
Chris Wren
38910d18e0 am 9fca530e: am 7339ed18: am 5f181efd: am fdc283e9: am 11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev 
* commit '9fca530e3f4491efb5945a2eae44d0899710410b':
  decide interruptions based on current data, not previous data.
 2015-07-27 14:15:32 +00:00
Chris Wren
87a28758c1 am a3a53c6b: am 447009e3: am eae9d6da: am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev 
* commit 'a3a53c6b409ada4aba84ffe25c2d6e891ec47a37':
  add ticker to enqueue message for easier debugging
 2015-07-27 14:15:25 +00:00
Geoff Mendal
855184113c am 3a5edd9f: (-s ours) am 4cd6da53: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '3a5edd9f183789090b657ab92db1425e74082fa6':
  Import translations. DO NOT MERGE
 2015-07-27 14:14:27 +00:00
Chris Wren
9fca530e3f am 7339ed18: am 5f181efd: am fdc283e9: am 11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev 
* commit '7339ed18978ae640a8ac053053459e1ef8c6bc8d':
  decide interruptions based on current data, not previous data.
 2015-07-27 14:02:27 +00:00
Chris Wren
a3a53c6b40 am 447009e3: am eae9d6da: am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev 
* commit '447009e3b014e8e9cc591c448064493ca22352f9':
  add ticker to enqueue message for easier debugging
 2015-07-27 14:02:22 +00:00
Geoff Mendal
3a5edd9f18 am 4cd6da53: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '4cd6da535a0b9a5938164edaa1a482a3c9f1ddf6':
  Import translations. DO NOT MERGE
 2015-07-27 14:02:12 +00:00
Derek Sollenberger
6cead94206 Merge "Change from SkDeviceProperties to SkSurfaceProps." 2015-07-27 13:51:32 +00:00
Derek Sollenberger
457672d5f0 Merge "switch to new signature for NewWithProc" 2015-07-27 13:51:32 +00:00
Geoff Mendal
4cd6da535a Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-27 13:48:16 +00:00
Chris Wren
7339ed1897 am 5f181efd: am fdc283e9: am 11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev 
* commit '5f181efd820c0554a071dd57b027ca35aa5b974f':
  decide interruptions based on current data, not previous data.
 2015-07-27 13:48:16 +00:00
Chris Wren
447009e3b0 am eae9d6da: am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev 
* commit 'eae9d6dae32ac01ac2ba0959eef0858a8c919c19':
  add ticker to enqueue message for easier debugging
 2015-07-27 13:48:09 +00:00
Geoff Mendal
10df6d4ccb Import translations. DO NOT MERGE 
Change-Id: I0805cc2f593746482579e1e8111f26ecd451173b
Auto-generated-cl: translation import
 2015-07-27 06:44:06 -07:00
Chris Wren
5f181efd82 am fdc283e9: am 11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev 
* commit 'fdc283e9231ad6f396441ccf4b50f46d151b28eb':
  decide interruptions based on current data, not previous data.
 2015-07-27 13:35:51 +00:00
Chris Wren
eae9d6dae3 am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev 
* commit '3dad6c661f76b69475bb38b950d74f5de3bb8a8f':
  add ticker to enqueue message for easier debugging
 2015-07-27 13:35:47 +00:00
Chris Wren
fdc283e923 am 11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev 
* commit '11f4cb1bccf47a0e985be6948f30709ba40f4522':
  decide interruptions based on current data, not previous data.
 2015-07-27 13:21:39 +00:00
Chris Wren
3dad6c661f am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev 
* commit '45a0bb18fec5b137a540e160cecd4ffd091098d9':
  add ticker to enqueue message for easier debugging
 2015-07-27 13:21:35 +00:00
Chris Wren
11f4cb1bcc Merge "decide interruptions based on current data, not previous data." into mnc-dev 2015-07-27 13:10:11 +00:00
Chris Wren
45a0bb18fe Merge "add ticker to enqueue message for easier debugging" into mnc-dev 2015-07-27 13:09:15 +00:00
Geoff Mendal
7e99dd0dbf Import translations. DO NOT MERGE 
Change-Id: Ice9b2e3e8808f8fd6e96dd564706692e89e26394
Auto-generated-cl: translation import
 2015-07-27 05:45:24 -07:00
Daichi Hirono
2e6eb521bc Merge "Implement openDevice/closeDevice method of MtpManager." 2015-07-27 07:01:49 +00:00
Daichi Hirono
675032330f Merge "Add openDevice and closeDevice methods to MtpDocumentsProvider." 2015-07-27 07:00:56 +00:00
Erik Kline
b1ca5ed701 am 05cf335f: am 04159d0b: am f0927733: am 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev 
* commit '05cf335fc4e9cd50ddac809a47bb59ca459cc67e':
  Change to connectivitycheck.gstatic.com
 2015-07-27 06:09:09 +00:00