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

131181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
35e120517d am fe08369d: Merge "Fixing the alternate recents transition on landscape views." 
* commit 'fe08369d8cd575f1f1db38f57be4c2a960f4a856':
  Fixing the alternate recents transition on landscape views.
 2014-04-16 17:30:00 +00:00
Winson Chung
fe08369d8c Merge "Fixing the alternate recents transition on landscape views." 2014-04-16 17:25:59 +00:00
Winson Chung
2820c4523c Fixing the alternate recents transition on landscape views. 
- This still assumes that we are taking square thumbnails.

Change-Id: I42a3d1b0505db57f815edf52cd176a3f651d5b37
 2014-04-16 09:56:42 -07:00
Baligh Uddin
583edcd10a am 3eff39fb: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" 
* commit '3eff39fb0f6425601b67296ee25f0497a70976ae':
  Revert "Import translations. DO NOT MERGE"
 2014-04-16 16:12:56 +00:00
Baligh Uddin
3eff39fb0f Merge "Revert "Import translations. DO NOT MERGE"" 2014-04-16 16:10:08 +00:00
Baligh Uddin
abe94cf196 Revert "Import translations. DO NOT MERGE" 
This reverts commit bcf6441e61725a2e6c04d03de43d209311da9d3a.

Change-Id: I8b556dfaeb45434e194503fe5ae77e744637f6c2
 2014-04-16 16:09:58 +00:00
Christoph Studer
a67e648f3e am 97096fd0: Merge "Write eventlog entries for notification visibility" 
* commit '97096fd0e64d5cdce3e24139ed6b13cc76c5047e':
  Write eventlog entries for notification visibility
 2014-04-16 15:54:18 +00:00
Christoph Studer
97096fd0e6 Merge "Write eventlog entries for notification visibility" 2014-04-16 15:49:54 +00:00
Baligh Uddin
4f71f89361 am 75534344: (-s ours) am e65c292a: (-s ours) am f104f676: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '755343447204575a8efb68769a3e6738987d225d':
  Import translations. DO NOT MERGE
 2014-04-16 15:37:52 +00:00
Baligh Uddin
7553434472 am e65c292a: (-s ours) am f104f676: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'e65c292a5e7f4d70a43f965909647f89bb46809d':
  Import translations. DO NOT MERGE
 2014-04-16 15:34:04 +00:00
Baligh Uddin
eb9063e747 am 3471e803: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '3471e8034975a12cdcdd1b6264ceb6d721031a7e':
  Import translations. DO NOT MERGE
 2014-04-16 15:32:42 +00:00
Baligh Uddin
425da10c50 am da7cc2c4: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'da7cc2c42de5f6bda4a13645ca5d8ad884df6b6a':
  Import translations. DO NOT MERGE
 2014-04-16 15:32:39 +00:00
Baligh Uddin
23f0fccfab am cf8aed65: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'cf8aed657ba43c479971badec48770edb8cee886':
  Import translations. DO NOT MERGE
 2014-04-16 15:32:35 +00:00
Baligh Uddin
e65c292a5e am f104f676: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'f104f676e375c5c53eb049705740ab592b914bda':
  Import translations. DO NOT MERGE
 2014-04-16 15:31:02 +00:00
Baligh Uddin
f104f676e3 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-16 15:28:29 +00:00
Baligh Uddin
3471e80349 Merge "Import translations. DO NOT MERGE" 2014-04-16 15:27:00 +00:00
Baligh Uddin
da7cc2c42d Merge "Import translations. DO NOT MERGE" 2014-04-16 15:26:24 +00:00
Baligh Uddin
cf8aed657b Merge "Import translations. DO NOT MERGE" 2014-04-16 15:26:20 +00:00
Christoph Studer
92b389da2a Write eventlog entries for notification visibility 
Keep track of notifications shown in the notification panel
and log them via eventlog.

Added the following eventlog tag:
  * notification_visibility_changed

Bug: 13442201
Change-Id: Ifb74ec2492967dc787b4de86db7d7f00be6c7f74
 2014-04-16 17:07:49 +02:00
Ben Murdoch
1b0f04fb06 am 6f51cd7e: Merge "Revert "Revert "Define new general permission APIs for webview.""" 
* commit '6f51cd7ede3abd1bc076a4aa24f6fd78ac3ad0fc':
  Revert "Revert "Define new general permission APIs for webview.""
 2014-04-16 12:49:17 +00:00
Ben Murdoch
6f51cd7ede Merge "Revert "Revert "Define new general permission APIs for webview.""" 2014-04-16 12:45:24 +00:00
Dongwon Kang
687d7dfe3b am 781c55fd: Merge "Handle the failure of session creation request in TvInputManagerService." 
* commit '781c55fda2fe2685209bdbc1d9554e4fb2b855bf':
  Handle the failure of session creation request in TvInputManagerService.
 2014-04-16 07:18:22 +00:00
Dongwon Kang
781c55fda2 Merge "Handle the failure of session creation request in TvInputManagerService." 2014-04-16 06:56:22 +00:00
Dongwon Kang
fd5b72f1ed Handle the failure of session creation request in TvInputManagerService. 
Bug: 14073508
Change-Id: Idc9da323bb0000300faf662c7db031214ae6136c
 2014-04-16 14:23:25 +09:00
Alan Viverette
eda22ea588 am 8b53023a: Merge "Fix action bar theme inheritance and icons, make colors public" 
* commit '8b53023a83f4f4ff1a726d78eca74b428255b935':
  Fix action bar theme inheritance and icons, make colors public
 2014-04-16 01:29:08 +00:00
Alan Viverette
8b53023a83 Merge "Fix action bar theme inheritance and icons, make colors public" 2014-04-16 01:24:51 +00:00
Alan Viverette
548ea547b9 Fix action bar theme inheritance and icons, make colors public 
Theme.Quantum.Light.DarkActionBar is still broken, but fix incoming.

BUG: 14084633
BUG: 14083272
Change-Id: Id5f2f9ce5b0af741fc79d1fb325cfee74c7a1e37
 2014-04-15 18:21:20 -07:00
John Spurlock
710c8a9f47 am 2d6196e4: Merge "Add \'read\' subcommand to the \'content\' tool." 
* commit '2d6196e4d2112bea39743fc9387d8714eff35572':
  Add 'read' subcommand to the 'content' tool.
 2014-04-16 00:12:36 +00:00
John Spurlock
2d6196e4d2 Merge "Add 'read' subcommand to the 'content' tool." 2014-04-16 00:10:00 +00:00
Christopher Tate
30812df59c am 9187e40b: Merge "Don\'t crash if a null key is passed for verification/parsing" 
* commit '9187e40b16b60b7d4ea62b0607b16089161cad09':
  Don't crash if a null key is passed for verification/parsing
 2014-04-16 00:06:31 +00:00
Christopher Tate
9187e40b16 Merge "Don't crash if a null key is passed for verification/parsing" 2014-04-15 23:59:46 +00:00
Vinod Krishnan
5127b3d8ab am 6f23e6d6: am da34482d: am 56a90cb8: Merge "Set wearable specific strings in framework" into klp-modular-dev 
* commit '6f23e6d622dc07782122e4c5ee985c247da781a6':
  Set wearable specific strings in framework
 2014-04-15 23:57:50 +00:00
Vinod Krishnan
6f23e6d622 am da34482d: am 56a90cb8: Merge "Set wearable specific strings in framework" into klp-modular-dev 
* commit 'da34482dfc879e741f1ab2f64a0c1741640186da':
  Set wearable specific strings in framework
 2014-04-15 23:51:48 +00:00
Vinod Krishnan
da34482dfc am 56a90cb8: Merge "Set wearable specific strings in framework" into klp-modular-dev 
* commit '56a90cb8e1a136d6367c0006bf8689fcc97211cb':
  Set wearable specific strings in framework
 2014-04-15 23:48:24 +00:00
Vinod Krishnan
56a90cb8e1 Merge "Set wearable specific strings in framework" into klp-modular-dev 2014-04-15 23:45:26 +00:00
Dmitriy Ivanov
4c195c4b32 am d7cc9e31: am 5c04c4e7: am 6ced3b34: am 0d54e471: Merge "Remove code markers" 
* commit 'd7cc9e3163ee19f9d6acf153209b52c47514c0ce':
  Remove code markers
 2014-04-15 23:42:07 +00:00
quddusc
fe5c5a9e5a am 23846c63: am 45f232cf: am 7ba3b3f4: am fe0996b7: am 60095240: docs: Updated the gradle build number to 4.3.23. Bug: 14043082 
* commit '23846c63807d836c838b32ec9e190153bf0abea6':
  docs: Updated the gradle build number to 4.3.23. Bug: 14043082
 2014-04-15 23:41:57 +00:00
Katie McCormick
0d9755c157 am 0b09a766: am 2aa70413: am 76b66a9a: am 2b4d89b7: am eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into klp-docs 
* commit '0b09a766241d466ad5243b7923df8ebc205f06fc':
  Doc change: Update CCS doc with new quota info.
 2014-04-15 23:41:53 +00:00
Todd Poynor
91c8c96734 am fb5c8bab: Merge "Context: fixup wrong Javadoc link for BatteryManager" 
* commit 'fb5c8baba52c041951f6a35545402b14e5bb3e56':
  Context: fixup wrong Javadoc link for BatteryManager
 2014-04-15 23:37:25 +00:00
Dmitriy Ivanov
d7cc9e3163 am 5c04c4e7: am 6ced3b34: am 0d54e471: Merge "Remove code markers" 
* commit '5c04c4e7b5f9dc76afe180c0b6a0901119834fcf':
  Remove code markers
 2014-04-15 23:36:27 +00:00
quddusc
23846c6380 am 45f232cf: am 7ba3b3f4: am fe0996b7: am 60095240: docs: Updated the gradle build number to 4.3.23. Bug: 14043082 
* commit '45f232cf579a1b4f8e32da08f17b7b7eb20ddc18':
  docs: Updated the gradle build number to 4.3.23. Bug: 14043082
 2014-04-15 23:36:13 +00:00
Katie McCormick
0b09a76624 am 2aa70413: am 76b66a9a: am 2b4d89b7: am eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into klp-docs 
* commit '2aa704133a914f4a8455862d74cc450b267f1b9a':
  Doc change: Update CCS doc with new quota info.
 2014-04-15 23:36:08 +00:00
Todd Poynor
fb5c8baba5 Merge "Context: fixup wrong Javadoc link for BatteryManager" 2014-04-15 23:33:42 +00:00
Adam Powell
b8af526f46 am 02c49498: am e1070928: (-s ours) am 50d7bfd8: DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views 
* commit '02c494985025b2354b35f611f8890637e229a0c5':
  DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views
 2014-04-15 23:29:10 +00:00
John Spurlock
cee823e4d4 Add 'read' subcommand to the 'content' tool. 
Access raw content exposed by content provider
openFile uris.

Bug:14079104
Change-Id: I9ef0e19f9354fa12408df1583b211a8d8a2e9fdb
 2014-04-15 19:28:08 -04:00
quddusc
1df4f6e7fa am ed2aad7b: Merge "resolved conflicts for merge of 99c3605c to master" 
* commit 'ed2aad7bff7cab98344fced7460a2f0e6188f2be':
  docs: Updated name of API to "Google Maps Android API v2". Bug: 13666553
 2014-04-15 23:24:25 +00:00
Adam Powell
02c4949850 am e1070928: (-s ours) am 50d7bfd8: DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views 
* commit 'e1070928795210a1894a454ff88e9d529ca381a7':
  DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views
 2014-04-15 23:20:37 +00:00
Jim Miller
d56f885a25 am 4c4fc3e1: Merge "Default to PASSWORD_QUALITY_UNSPECIFIED" 
* commit '4c4fc3e172f7ba1a3d3c04145472d2b6607e0608':
  Default to PASSWORD_QUALITY_UNSPECIFIED
 2014-04-15 23:19:21 +00:00
quddusc
ed2aad7bff Merge "resolved conflicts for merge of 99c3605c to master" 2014-04-15 23:19:16 +00:00
quddusc
861d6348de resolved conflicts for merge of 99c3605c to master 
Change-Id: I76383ec78cec780566256e709d3cbc371c3bd73d
 2014-04-15 16:18:01 -07:00