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

156304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
c344cdc1bb am ccb7a9af: Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev 
* commit 'ccb7a9af271836fde98636d9ce6ebbda09eb0158':
  Prevent ChooserActivity from taking over the system bars
 2014-10-16 14:56:40 +00:00
Adrian Roos
ccb7a9af27 Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev 2014-10-16 14:54:19 +00:00
George Mount
27a08f2ad5 am ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev 
* commit 'ea6f0ae86d62cff88d63b926578c588a956d0512':
  Use empty snapshots list when there are no shared elements.
 2014-10-16 14:25:45 +00:00
George Mount
ea6f0ae86d Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev 2014-10-16 14:21:43 +00:00
Quddus Chong
e58249f84a am 7ef4ba61: am 073c80d3: am 0a276b94: Merge "docs: Added L API overview." into lmp-dev 
* commit '7ef4ba61c83871ea02df760729524bfc7c27b8a9':
  docs: Added L API overview.
 2014-10-16 06:49:52 +00:00
Dirk Dougherty
382170af6d am b175ee29: am 41d5d14d: am 8ca0f84e: Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev 
* commit 'b175ee295e4e159ca5ac062f7732a5c785c9133b':
  Doc change: Add diffs for l-preview -> API level 21.
 2014-10-16 06:49:47 +00:00
Geoff Mendal
08d339fc20 am 7ef55776: (-s ours) am e134ac1c: (-s ours) am e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '7ef557764c27efc5766c849b4982c70d05864dfe':
  Import translations. DO NOT MERGE
 2014-10-16 06:49:43 +00:00
Craig Mautner
45e0baf333 am 49bb8cdc: am d1a58c45: am 5d460b88: Merge "Remove unnecessary logging." into lmp-dev 
* commit '49bb8cdc5ecf42bdb66d948a900bee10de1c8323':
  Remove unnecessary logging.
 2014-10-16 06:49:38 +00:00
Eric Rowe
1e684b3ded am ea626e1a: am de96b966: am 1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 
* commit 'ea626e1af8019786d514d3de0b8a1fa274ca424c':
  Add CHANGE_NETWORK_STATE permission to bt tests
 2014-10-16 06:49:34 +00:00
Craig Mautner
2ecd9de2d5 am d1bba16d: am 87441860: am e5279105: Merge "Move desired task to top if not already there." into lmp-dev 
* commit 'd1bba16da53f927792f489057c1d477b8079876e':
  Move desired task to top if not already there.
 2014-10-16 06:49:29 +00:00
John Spurlock
c824a9d444 am 4f7eee43: am 3d4aec1b: am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 
* commit '4f7eee438be7e51d7988a2a61123139e74b7b802':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
 2014-10-16 06:49:24 +00:00
Evan Charlton
e3d3aa3f38 am df88ad0b: am e8a700e9: am 843e2343: Add WindowManager.aidl to AIDL list 
* commit 'df88ad0b81b8b1a6ca76d5961632717165594e9f':
  Add WindowManager.aidl to AIDL list
 2014-10-16 06:49:20 +00:00
RoboErik
5e1b92c054 am 56d8876f: am 0dfd86e0: am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev 
* commit '56d8876f4b9a1a43e4eed0d8b1afff26331cf095':
  Don't call size on a null metadata
 2014-10-16 06:49:16 +00:00
Quddus Chong
7ef4ba61c8 am 073c80d3: am 0a276b94: Merge "docs: Added L API overview." into lmp-dev 
* commit '073c80d346e053532092efec9c2c12a3a39d2dcd':
  docs: Added L API overview.
 2014-10-16 05:52:08 +00:00
Dirk Dougherty
b175ee295e am 41d5d14d: am 8ca0f84e: Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev 
* commit '41d5d14df218d2711be0b16b0f15ddd4cabf3a4f':
  Doc change: Add diffs for l-preview -> API level 21.
 2014-10-16 05:52:04 +00:00
Geoff Mendal
7ef557764c am e134ac1c: (-s ours) am e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e134ac1cece66293b31543948fbabc5b7fc64b94':
  Import translations. DO NOT MERGE
 2014-10-16 05:52:01 +00:00
Craig Mautner
49bb8cdc5e am d1a58c45: am 5d460b88: Merge "Remove unnecessary logging." into lmp-dev 
* commit 'd1a58c45fee09c5e599fe173d5055546fe147b03':
  Remove unnecessary logging.
 2014-10-16 05:51:56 +00:00
Eric Rowe
ea626e1af8 am de96b966: am 1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 
* commit 'de96b966fb6c8e0694f3a94fc0f42d64090d4fa0':
  Add CHANGE_NETWORK_STATE permission to bt tests
 2014-10-16 05:51:52 +00:00
Craig Mautner
d1bba16da5 am 87441860: am e5279105: Merge "Move desired task to top if not already there." into lmp-dev 
* commit '87441860bf4df2da7ce4537ad31c8240547da655':
  Move desired task to top if not already there.
 2014-10-16 05:51:48 +00:00
John Spurlock
4f7eee438b am 3d4aec1b: am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 
* commit '3d4aec1bb79caea6fadc36a942fb0c0f84a0f4f2':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
 2014-10-16 05:51:45 +00:00
Evan Charlton
df88ad0b81 am e8a700e9: am 843e2343: Add WindowManager.aidl to AIDL list 
* commit 'e8a700e9f7956333df647eebe5e8c9eb1ea8c12c':
  Add WindowManager.aidl to AIDL list
 2014-10-16 05:51:41 +00:00
RoboErik
56d8876f4b am 0dfd86e0: am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev 
* commit '0dfd86e00656573cdd3e28742e93319c96f6ce15':
  Don't call size on a null metadata
 2014-10-16 05:51:37 +00:00
Geoff Mendal
c1c44c1bff am 79469425: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '79469425a170b9f8af20153078fb20d6400beefa':
  Import translations. DO NOT MERGE
 2014-10-16 01:48:57 +00:00
Geoff Mendal
a2ac1ade83 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-16 01:48:29 +00:00
Geoff Mendal
062ddcd116 Import translations. DO NOT MERGE 
Change-Id: I245fdc0e9d1b88231970e945521aaf2813a97b44
Auto-generated-cl: translation import
 2014-10-15 18:44:21 -07:00
Geoff Mendal
79469425a1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-16 01:43:51 +00:00
Geoff Mendal
750305b534 Import translations. DO NOT MERGE 
Change-Id: I298dbca14148e723e574c299e6ee1d3aebd9b56c
Auto-generated-cl: translation import
 2014-10-15 18:40:57 -07:00
Alan Viverette
ca66be9e0e am b4a29247: Merge "Set content description on CalendarView day labels" into lmp-mr1-dev 
* commit 'b4a29247ffb58f44e50edad7cf56ffc2ea0d7c6b':
  Set content description on CalendarView day labels
 2014-10-16 01:21:32 +00:00
Alan Viverette
b4a29247ff Merge "Set content description on CalendarView day labels" into lmp-mr1-dev 2014-10-16 01:07:04 +00:00
Alan Viverette
c07241cab3 am 05110234: Merge "Document Toolbar\'s vertical alignment strategy" into lmp-mr1-dev 
* commit '0511023432ff24c5ddda563e326273936b5d40f5':
  Document Toolbar's vertical alignment strategy
 2014-10-16 00:52:29 +00:00
Alan Viverette
205a5e69cc am 8afc90fd: Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev 
* commit '8afc90fd715457033ca70dae3cd53377957d8b94':
  Add style support to PopupMenu, clean up constructor javadoc
 2014-10-16 00:52:24 +00:00
Alan Viverette
0511023432 Merge "Document Toolbar's vertical alignment strategy" into lmp-mr1-dev 2014-10-16 00:46:24 +00:00
Alan Viverette
8afc90fd71 Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev 2014-10-16 00:44:36 +00:00
Adam Powell
f8c7d87a65 am 19c0a163: Merge "View measurement optimization" into lmp-mr1-dev 
* commit '19c0a1632f3be67c8cbbee210cd6d8eedfe3649a':
  View measurement optimization
 2014-10-16 00:28:16 +00:00
Geoff Mendal
c892fb1860 am cc29c5ef: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'cc29c5ef825a45cc106ef9891930a9cb52036d13':
  Import translations. DO NOT MERGE
 2014-10-16 00:28:11 +00:00
Adam Powell
19c0a1632f Merge "View measurement optimization" into lmp-mr1-dev 2014-10-16 00:21:29 +00:00
Geoff Mendal
cc29c5ef82 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-16 00:21:26 +00:00
Alan Viverette
29632521c3 Add style support to PopupMenu, clean up constructor javadoc 
BUG: 18002523
Change-Id: Ice492686b814460248ccbe9727c64dd002e7ed7a
 2014-10-15 17:19:30 -07:00
Geoff Mendal
5e14dc8426 Import translations. DO NOT MERGE 
Change-Id: I1232fd67bffa5401e778116a418bbc20902f2723
Auto-generated-cl: translation import
 2014-10-15 17:16:40 -07:00
xinhe
1a352f4f6b am 36eaa869: Merge "Sprint: MMS proxy authorization does not include NAI" into lmp-mr1-dev 
* commit '36eaa8690da761a4218a790e18858e4319ffa8d0':
  Sprint: MMS proxy authorization does not include NAI
 2014-10-15 23:49:13 +00:00
xinhe
36eaa8690d Merge "Sprint: MMS proxy authorization does not include NAI" into lmp-mr1-dev 2014-10-15 23:41:54 +00:00
Quddus Chong
073c80d346 am 0a276b94: Merge "docs: Added L API overview." into lmp-dev 
* commit '0a276b9448d907822bee1c3009608694fc480fcc':
  docs: Added L API overview.
 2014-10-15 23:41:23 +00:00
Dirk Dougherty
41d5d14df2 am 8ca0f84e: Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev 
* commit '8ca0f84ea3c6f17e7d0121a87197bfd25f9becfa':
  Doc change: Add diffs for l-preview -> API level 21.
 2014-10-15 23:41:13 +00:00
Geoff Mendal
e134ac1cec am e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e2a1f1cd885ae73fc165f0623697b94668e01c86':
  Import translations. DO NOT MERGE
 2014-10-15 23:41:05 +00:00
Craig Mautner
d1a58c45fe am 5d460b88: Merge "Remove unnecessary logging." into lmp-dev 
* commit '5d460b88715c8a902eb3930e690ddd1b8d84338f':
  Remove unnecessary logging.
 2014-10-15 23:40:54 +00:00
Eric Rowe
de96b966fb am 1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 
* commit '1b4a728ac689fc63b5b5153e95b8b634f701fcfb':
  Add CHANGE_NETWORK_STATE permission to bt tests
 2014-10-15 23:40:40 +00:00
Craig Mautner
87441860bf am e5279105: Merge "Move desired task to top if not already there." into lmp-dev 
* commit 'e52791055c855a957cad767dfa9889faae86660c':
  Move desired task to top if not already there.
 2014-10-15 23:40:11 +00:00
John Spurlock
3d4aec1bb7 am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 
* commit 'b2344c81bcf49129d303a2919cfffd7a720c261b':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
 2014-10-15 23:40:07 +00:00
Evan Charlton
e8a700e9f7 am 843e2343: Add WindowManager.aidl to AIDL list 
* commit '843e234318421b320e74bb2d09c3b436d82ee127':
  Add WindowManager.aidl to AIDL list
 2014-10-15 23:39:57 +00:00
RoboErik
0dfd86e006 am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev 
* commit 'c7be69f1d63bcc8411875ff53e5561f2f4692072':
  Don't call size on a null metadata
 2014-10-15 23:39:29 +00:00