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

95817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Katie McCormick
37f0af99ce am 474f356c: am 9c662274: am c1291f70: am c5b47cff: resolved conflicts for merge of 7f9a0535 to jb-mr1-dev 
* commit '474f356cdd4651ab44eeb3aab077ecf8fcf261e7':
  Doc change: GCM category & dry_run params
 2012-11-12 12:14:28 -08:00
Katie McCormick
474f356cdd am 9c662274: am c1291f70: am c5b47cff: resolved conflicts for merge of 7f9a0535 to jb-mr1-dev 
* commit '9c66227406bb9c84948a531ec3c4be3641329ddc':
  Doc change: GCM category & dry_run params
 2012-11-12 12:11:48 -08:00
Katie McCormick
9c66227406 am c1291f70: am c5b47cff: resolved conflicts for merge of 7f9a0535 to jb-mr1-dev 
* commit 'c1291f700a537a18b9123ad626ae1a4ab008a9f5':
  Doc change: GCM category & dry_run params
 2012-11-12 12:10:05 -08:00
Katie McCormick
c1291f700a am c5b47cff: resolved conflicts for merge of 7f9a0535 to jb-mr1-dev 
* commit 'c5b47cff8891429f4f5cf9d6026cc2f8cfe8fcc5':
  Doc change: GCM category & dry_run params
 2012-11-12 12:07:44 -08:00
Jeff Sharkey
f2fb1ae93e am 3acb098c: am 25c94e9e: am 282e9fc6: Merge "Avoid recycling recently removed user IDs." into jb-mr1.1-dev 
* commit '3acb098cf478dab086209d4230a6cf8513aacc1a':
  Avoid recycling recently removed user IDs.
 2012-11-12 10:36:50 -08:00
Jeff Sharkey
a19a027c76 am 298d5f42: am b84f21c5: am bc0edecb: Merge "Increase readability of connectivity event log." into jb-mr1.1-dev 
* commit '298d5f422e6af0d12499173c403d4ff8dda3aeda':
  Increase readability of connectivity event log.
 2012-11-12 10:36:46 -08:00
Jeff Sharkey
3acb098cf4 am 25c94e9e: am 282e9fc6: Merge "Avoid recycling recently removed user IDs." into jb-mr1.1-dev 
* commit '25c94e9ee302db6a0a94ffaf109b3eed7ac4ccb5':
  Avoid recycling recently removed user IDs.
 2012-11-12 10:34:45 -08:00
Jeff Sharkey
298d5f422e am b84f21c5: am bc0edecb: Merge "Increase readability of connectivity event log." into jb-mr1.1-dev 
* commit 'b84f21c536e8779cb7920d422469fd6973497823':
  Increase readability of connectivity event log.
 2012-11-12 10:34:37 -08:00
Jeff Sharkey
25c94e9ee3 am 282e9fc6: Merge "Avoid recycling recently removed user IDs." into jb-mr1.1-dev 
* commit '282e9fc62e571aba741ddc9523d6dfe2eca313b6':
  Avoid recycling recently removed user IDs.
 2012-11-12 10:32:11 -08:00
Jeff Sharkey
b84f21c536 am bc0edecb: Merge "Increase readability of connectivity event log." into jb-mr1.1-dev 
* commit 'bc0edecb7372a9ddf7644cb694c131b76ace8c41':
  Increase readability of connectivity event log.
 2012-11-12 10:32:08 -08:00
Jeff Sharkey
282e9fc62e Merge "Avoid recycling recently removed user IDs." into jb-mr1.1-dev 2012-11-12 10:30:12 -08:00
Jeff Sharkey
bc0edecb73 Merge "Increase readability of connectivity event log." into jb-mr1.1-dev 2012-11-12 10:28:34 -08:00
Justin Koh
14b46b1583 am 674db142: am 44643269: Merge "Make tap events less sensitive." into jb-mr1-aah-dev 
* commit '674db142c56f01e581f7df4f3013e22f0922b21f':
  Make tap events less sensitive.
 2012-11-12 10:26:29 -08:00
Justin Koh
674db142c5 am 44643269: Merge "Make tap events less sensitive." into jb-mr1-aah-dev 
* commit '446432692a2a7e60c7f547d6c7436922eb571d8e':
  Make tap events less sensitive.
 2012-11-12 10:24:21 -08:00
Justin Koh
446432692a Merge "Make tap events less sensitive." into jb-mr1-aah-dev 2012-11-12 10:20:43 -08:00
Ben Pietrzak
ffb5bdef63 Make tap events less sensitive. 
Change-Id: I4d6f70b56373fbc51a414510897854078eeb0c40
 2012-11-12 10:11:52 -08:00
Katie McCormick
c5b47cff88 resolved conflicts for merge of 7f9a0535 to jb-mr1-dev 
Change-Id: I8aee63b128a833ff8c2aaf2167850815033766dd
 2012-11-12 10:07:09 -08:00
John Spurlock
b80bc6737f am 4299f63e: am b340fe4f: am f6f47e95: Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev 
* commit '4299f63e54dceeaaa44a057ba03f0881834491ec':
  Disable navbar searchlight if search assist not available.
 2012-11-12 08:00:19 -08:00
John Spurlock
4299f63e54 am b340fe4f: am f6f47e95: Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev 
* commit 'b340fe4f88226ec35f0a4058f514b764b0f3977d':
  Disable navbar searchlight if search assist not available.
 2012-11-12 07:58:09 -08:00
John Spurlock
b340fe4f88 am f6f47e95: Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev 
* commit 'f6f47e950ddbb91fcce30f2f3e610a4d249b9bdb':
  Disable navbar searchlight if search assist not available.
 2012-11-12 07:55:24 -08:00
John Spurlock
f6f47e950d Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev 2012-11-12 07:52:08 -08:00
The Android Open Source Project
5a7b18d919 am 3d8e66ab: (-s ours) am f1159e6b: am 725a2ffe: Reconcile with jb-mr1-release - do not merge 
* commit '3d8e66ab764c7cec9bdf3bc99829eeef0d3e7dcb':
  When in vibrate mode, all notifications will vibrate.
 2012-11-12 07:34:16 -08:00
The Android Open Source Project
3d8e66ab76 am f1159e6b: am 725a2ffe: Reconcile with jb-mr1-release - do not merge 
* commit 'f1159e6b5e796d597286da8d8d842947a4044ce3':
  When in vibrate mode, all notifications will vibrate.
 2012-11-12 07:31:18 -08:00
Glenn Kasten
4b8005b362 Merge "Add all-channel setVolume() API" 2012-11-12 07:30:42 -08:00
The Android Open Source Project
f1159e6b5e am 725a2ffe: Reconcile with jb-mr1-release - do not merge 
* commit '725a2ffe3b615515acd14b8b379078930de64249':
  When in vibrate mode, all notifications will vibrate.
 2012-11-12 07:28:38 -08:00
The Android Open Source Project
725a2ffe3b Reconcile with jb-mr1-release - do not merge 
Change-Id: I310560c329cb0d8aeb664c67ea6e67e006809637
 2012-11-12 07:26:14 -08:00
Satoshi Kataoka
d214296f7f Fix an issue on LED in IME switcher 
Bug: 5282186
Change-Id: I66362aefb319a02ca741e40a50b8b345a89c8726
 2012-11-12 18:43:06 +09:00
David Agnew
f7ef504845 am 876a2197: am d625f0a1: am 7259d88c: am 4c0fc03b: When in vibrate mode, all notifications will vibrate. 
* commit '876a2197b9428a91eabac47939379ac257dc6e31':
  When in vibrate mode, all notifications will vibrate.
 2012-11-10 11:57:29 -08:00
David Agnew
876a2197b9 am d625f0a1: am 7259d88c: am 4c0fc03b: When in vibrate mode, all notifications will vibrate. 
* commit 'd625f0a1475fb83573bf8a7a7d1899b621de507e':
  When in vibrate mode, all notifications will vibrate.
 2012-11-10 11:55:30 -08:00
David Agnew
d625f0a147 am 7259d88c: am 4c0fc03b: When in vibrate mode, all notifications will vibrate. 
* commit '7259d88c08df220095a4aeaa752bd8e1055f4e83':
  When in vibrate mode, all notifications will vibrate.
 2012-11-10 11:52:38 -08:00
David Agnew
7259d88c08 am 4c0fc03b: When in vibrate mode, all notifications will vibrate. 
* commit '4c0fc03b5ed396d19035ee6a77a70189a0fba31a':
  When in vibrate mode, all notifications will vibrate.
 2012-11-10 11:49:51 -08:00
David Agnew
4c0fc03b5e When in vibrate mode, all notifications will vibrate. 
(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)

Bug: 7516358
Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444
 2012-11-10 14:35:02 -05:00
Ed Heyl
2184f99aab am ffea9170: am 5ec97f4e: am 4f017e75: Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev 
* commit 'ffea917025254ab33670b1268588d63514ddf918':
  When in vibrate mode, all notifications will vibrate.
 2012-11-09 23:57:05 -08:00
Ed Heyl
ffea917025 am 5ec97f4e: am 4f017e75: Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev 
* commit '5ec97f4e82e1adc3bffb9c998b302464517e1f04':
  When in vibrate mode, all notifications will vibrate.
 2012-11-09 23:54:08 -08:00
Ed Heyl
5ec97f4e82 am 4f017e75: Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev 
* commit '4f017e757bdc87d603d135386c888118fc2653ba':
  When in vibrate mode, all notifications will vibrate.
 2012-11-09 22:53:24 -08:00
David Agnew
9a7debe585 When in vibrate mode, all notifications will vibrate. 
(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)

Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444
 2012-11-09 22:51:37 -08:00
Scott Main
6e9801a780 am 88b0d1e3: am 78f7e807: am e72e2b74: am 85abb087: Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev 
* commit '88b0d1e3687194d7046e10e56f087cd80389edd7':
  docs: update Tools landing page with info for developer options
 2012-11-09 22:49:43 -08:00
Jeff Sharkey
ec14d78cfa am 1aa4f6fe: am 5691474c: am ad08e6dc: Merge "Emit event log message when switching users." into jb-mr1.1-dev 
* commit '1aa4f6fe7e150fb60c5f28a9c4dd8ad6fb06984a':
  Emit event log message when switching users.
 2012-11-09 22:49:38 -08:00
Ed Heyl
4f017e757b Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev 2012-11-09 22:49:35 -08:00
Baligh Uddin
bf58331a68 am 8baf63d5: (-s ours) am eba39ec1: am df2670f1: am ba52aff4: Import translations. DO NOT MERGE 
* commit '8baf63d5bae9a96d34b29f3c75d51bf079642352':
  Import translations. DO NOT MERGE
 2012-11-09 22:49:34 -08:00
Andy McFadden
b842467027 am 9d42794d: am a7113f70: am 798de53c: Merge "Reduce emulator logspam" into jb-mr1.1-dev 
* commit '9d42794dde0dc6f83b6cf29ba66c3cf535ec9ae3':
  Reduce emulator logspam
 2012-11-09 22:49:30 -08:00
Scott Main
88b0d1e368 am 78f7e807: am e72e2b74: am 85abb087: Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev 
* commit '78f7e807dfec36fe695f7b2d7241c1a188893d20':
  docs: update Tools landing page with info for developer options
 2012-11-09 22:45:37 -08:00
Jeff Sharkey
1aa4f6fe7e am 5691474c: am ad08e6dc: Merge "Emit event log message when switching users." into jb-mr1.1-dev 
* commit '5691474c9cbaeb37eeb659a3adbc05d31d668611':
  Emit event log message when switching users.
 2012-11-09 22:45:33 -08:00
Baligh Uddin
8baf63d5ba am eba39ec1: am df2670f1: am ba52aff4: Import translations. DO NOT MERGE 
* commit 'eba39ec15c1d07f5fe0c48d7d1176cc0b388d9d0':
  Import translations. DO NOT MERGE
 2012-11-09 22:45:30 -08:00
Andy McFadden
9d42794dde am a7113f70: am 798de53c: Merge "Reduce emulator logspam" into jb-mr1.1-dev 
* commit 'a7113f70c55517b5dbf3c54827c4559304faff4f':
  Reduce emulator logspam
 2012-11-09 22:45:26 -08:00
Baligh Uddin
d05c9763bc am aa29e48b: (-s ours) am ff87960b: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'aa29e48b2b711a2bf39666c8ecf108fc9c54de05':
  Import translations. DO NOT MERGE
 2012-11-09 22:44:28 -08:00
Scott Main
78f7e807df am e72e2b74: am 85abb087: Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev 
* commit 'e72e2b74bf5ae66524fc5d1872ba759b85728c65':
  docs: update Tools landing page with info for developer options
 2012-11-09 22:42:13 -08:00
Jeff Sharkey
5691474c9c am ad08e6dc: Merge "Emit event log message when switching users." into jb-mr1.1-dev 
* commit 'ad08e6dcfc54556759a876106419b4169e9caffe':
  Emit event log message when switching users.
 2012-11-09 22:42:06 -08:00
Baligh Uddin
eba39ec15c am df2670f1: am ba52aff4: Import translations. DO NOT MERGE 
* commit 'df2670f162dc7756899f4036750ba6866f5326c6':
  Import translations. DO NOT MERGE
 2012-11-09 22:41:59 -08:00
Andy McFadden
a7113f70c5 am 798de53c: Merge "Reduce emulator logspam" into jb-mr1.1-dev 
* commit '798de53cf454595a3a494d26dfa3f08518c24e55':
  Reduce emulator logspam
 2012-11-09 22:41:51 -08:00