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

92360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
885934ff45 am 749c179e: am 8d0c431a: am 009d5413: Merge "Fix bugs in scriptGroup." into jb-mr1-dev 
* commit '749c179ed5a1cdb2f6742fbe3bb491404a19acca':
  Fix bugs in scriptGroup.
 2012-10-16 10:58:03 -07:00
Steven Ross
9a9f4ce1e2 Stopping Face Unlock immediately on detaching from window fixes 7338808 
The refactoring broke my fix for 7222226.  We need to stop Face Unlock without
any messaging delay when the window is detached to avoid it starting with an
invalid window, or stopping right after it restarts.

Change-Id: Iea23989ec2ab3ad7d1a57e2d1fb85163a6396024
 2012-10-16 13:56:37 -04:00
Jason Sams
749c179ed5 am 8d0c431a: am 009d5413: Merge "Fix bugs in scriptGroup." into jb-mr1-dev 
* commit '8d0c431a5284a7374b889b9b719e88ba993469f9':
  Fix bugs in scriptGroup.
 2012-10-16 10:55:20 -07:00
Jason Sams
8d0c431a52 am 009d5413: Merge "Fix bugs in scriptGroup." into jb-mr1-dev 
* commit '009d5413b2730df842cf91a68c3cf6d6d7b4cb6e':
  Fix bugs in scriptGroup.
 2012-10-16 10:52:46 -07:00
Jason Sams
009d5413b2 Merge "Fix bugs in scriptGroup." into jb-mr1-dev 2012-10-16 10:50:19 -07:00
Justin Ho
d3a6e2f13c am f28a31db: am 5c2e971a: am 8c8596e8: Merge "Add new tablet sound set Bug: 7351672" into jb-mr1-dev 
* commit 'f28a31db78004447071b6f44369df20e36ae801e':
  Add new tablet sound set Bug: 7351672
 2012-10-16 10:36:30 -07:00
Justin Ho
f28a31db78 am 5c2e971a: am 8c8596e8: Merge "Add new tablet sound set Bug: 7351672" into jb-mr1-dev 
* commit '5c2e971a8f91cff567017bb4cfb8e88d9d091152':
  Add new tablet sound set Bug: 7351672
 2012-10-16 10:33:49 -07:00
Justin Ho
5c2e971a8f am 8c8596e8: Merge "Add new tablet sound set Bug: 7351672" into jb-mr1-dev 
* commit '8c8596e8e7fc6ea072fbfa90e19209aaed0fe506':
  Add new tablet sound set Bug: 7351672
 2012-10-16 10:31:04 -07:00
Justin Ho
8c8596e8e7 Merge "Add new tablet sound set Bug: 7351672" into jb-mr1-dev 2012-10-16 10:28:38 -07:00
Baligh Uddin
26efa48ea8 am 8b669df5: (-s ours) am 93c14d1d: am 4682cf02: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '8b669df57bfa9743e47b685630969cebd1412112':
  Import translations. DO NOT MERGE
 2012-10-16 09:25:02 -07:00
Baligh Uddin
8b669df57b am 93c14d1d: am 4682cf02: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '93c14d1d468656d143292e4f5fdd2bdef2592e05':
  Import translations. DO NOT MERGE
 2012-10-16 09:22:22 -07:00
Baligh Uddin
d9f682b71e Merge "Import translations. DO NOT MERGE" 2012-10-16 09:21:12 -07:00
Justin Ho
4cd64d87fd am 34dc17f3: am 4cfcfd53: am 0fcc2977: Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev 
* commit '34dc17f3d47d536e8cbf6801e1550b310089bfb4':
  Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
 2012-10-16 09:20:12 -07:00
Baligh Uddin
52b0c9f6dd am d1a04cb5: (-s ours) am c8e2b336: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'd1a04cb56748f3d9b3b16ccd52a4fc0672935e1a':
  Import translations. DO NOT MERGE
 2012-10-16 09:20:07 -07:00
Baligh Uddin
93c14d1d46 am 4682cf02: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '4682cf02b42f75876f14f512e874c3e798b09c9c':
  Import translations. DO NOT MERGE
 2012-10-16 09:18:21 -07:00
Justin Ho
0365e85a67 am fd4ef4b1: am d2c9dcf7: am 4add7431: Merge "Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"" into jb-mr1-dev 
* commit 'fd4ef4b1592795f2ae082528df4eb4c48c0564e9':
  Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"
 2012-10-16 09:17:21 -07:00
Baligh Uddin
f37678a878 am b6b1f62a: (-s ours) am 10a77aa5: am 75e861b6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'b6b1f62a42bf41c48d014615603208998d0f2ae4':
  Import translations. DO NOT MERGE
 2012-10-16 09:17:18 -07:00
Justin Ho
34dc17f3d4 am 4cfcfd53: am 0fcc2977: Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev 
* commit '4cfcfd53fbe1764dd284c308b9f15373d1d1cd30':
  Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
 2012-10-16 09:17:15 -07:00
Baligh Uddin
abcade56bf am a6966d56: (-s ours) am e485dc7e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'a6966d56a817d57b1741d65a2c783144589e4c08':
  Import translations. DO NOT MERGE
 2012-10-16 09:17:14 -07:00
Baligh Uddin
d1a04cb567 am c8e2b336: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'c8e2b336cf90cbd29c4348f539ff4af8e23af1e5':
  Import translations. DO NOT MERGE
 2012-10-16 09:17:11 -07:00
Justin Ho
4cfcfd53fb am 0fcc2977: Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev 
* commit '0fcc2977d08065eec0cd5c716718741dd1ecdfa0':
  Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
 2012-10-16 09:15:40 -07:00
Baligh Uddin
4682cf02b4 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-16 09:15:14 -07:00
Justin Ho
fd4ef4b159 am d2c9dcf7: am 4add7431: Merge "Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"" into jb-mr1-dev 
* commit 'd2c9dcf75e14dc4eb18507ccfd956f2dc9312f25':
  Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"
 2012-10-16 09:14:23 -07:00
Baligh Uddin
b6b1f62a42 am 10a77aa5: am 75e861b6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '10a77aa56ffa0257ddd19b0094e67be724db4c83':
  Import translations. DO NOT MERGE
 2012-10-16 09:14:20 -07:00
Baligh Uddin
a6966d56a8 am e485dc7e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'e485dc7e5f687dc97e2b53bf9a4a40737423ce7d':
  Import translations. DO NOT MERGE
 2012-10-16 09:14:19 -07:00
Baligh Uddin
c8e2b336cf Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-16 09:14:05 -07:00
Justin Ho
0fcc2977d0 Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev 2012-10-16 09:13:48 -07:00
Justin Ho
5d7c089cab Update alarm sounds and tune some ringtones 
Bug: 7351672
Bug: 5502770
Bug: 7312457

Change-Id: Iea0d674431b0fabbf7e9c4b30d9f08a6235cdc64
 2012-10-16 09:12:19 -07:00
Justin Ho
d2c9dcf75e am 4add7431: Merge "Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"" into jb-mr1-dev 
* commit '4add743111cfd558c7b1c95b0b58b90a53e7556a':
  Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"
 2012-10-16 09:11:57 -07:00
Baligh Uddin
10a77aa56f am 75e861b6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '75e861b689ef8d099250f4dd558cdc1dfc3a7c1f':
  Import translations. DO NOT MERGE
 2012-10-16 09:11:53 -07:00
Baligh Uddin
62e546016e Merge "Import translations. DO NOT MERGE" 2012-10-16 09:10:38 -07:00
Justin Ho
4add743111 Merge "Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"" into jb-mr1-dev 2012-10-16 09:08:22 -07:00
Baligh Uddin
75e861b689 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-16 09:08:22 -07:00
Justin Ho
c1188696b6 Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" 
This reverts commit 04fe8723e48644bf5e1afc098f2117cbec6ba68d

Change-Id: I28ed23ad75ced96b66cc4dcce0faaf667c2d5d08
 2012-10-16 09:07:39 -07:00
Craig Mautner
a4942c9fb9 Revert app freeze timeout delay. 
Speed up of wallpaper loading on Manta means this workaround is no
longer necessary.

Bug 7354440 fixed.

Change-Id: Ic0ad3c689abb5342fb29c824857db9d5c2d45008
 2012-10-16 09:06:53 -07:00
Baligh Uddin
e485dc7e5f Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-16 09:06:20 -07:00
Justin Ho
5e7669d15f am 0d5bd804: am aa1805de: am 08876d19: Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev 
* commit '0d5bd80451c914f075658397aaecc9b2f1f97b77':
  Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
 2012-10-16 09:01:03 -07:00
Justin Ho
81314ae077 Add new tablet sound set 
Bug: 7351672

Change-Id: I9228d3f87729862f94727f99a179538551449881
 2012-10-16 08:59:30 -07:00
Justin Ho
0d5bd80451 am aa1805de: am 08876d19: Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev 
* commit 'aa1805deeae6df16796d44d318bde8c612e56d13':
  Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
 2012-10-16 08:58:22 -07:00
Justin Ho
aa1805deea am 08876d19: Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev 
* commit '08876d19923e04f1a654264a075f87ff73334469':
  Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
 2012-10-16 08:55:22 -07:00
Justin Ho
08876d1992 Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev 2012-10-16 08:51:40 -07:00
Daniel Sandler
1d47c778ee am 1097addf: am 6d8b8e06: am 18ea8f29: Merge "Flipping quick settings!" into jb-mr1-dev 
* commit '1097addfd496fcc3b1dbfaf95b05ba8481df0967':
  Flipping quick settings!
 2012-10-16 07:50:51 -07:00
Daniel Sandler
1097addfd4 am 6d8b8e06: am 18ea8f29: Merge "Flipping quick settings!" into jb-mr1-dev 
* commit '6d8b8e06cd7f55483525727e156bed1fb7060478':
  Flipping quick settings!
 2012-10-16 07:48:06 -07:00
Daniel Sandler
6d8b8e06cd am 18ea8f29: Merge "Flipping quick settings!" into jb-mr1-dev 
* commit '18ea8f29909e7e80a8c5dc63b86678d89b7e5664':
  Flipping quick settings!
 2012-10-16 07:45:39 -07:00
Daniel Sandler
18ea8f2990 Merge "Flipping quick settings!" into jb-mr1-dev 2012-10-16 07:42:48 -07:00
Daniel Sandler
101784e560 Flipping quick settings! 
Bug: 7348917 ╰(°□°╰)
Change-Id: I16923d6d920913a4bd0d78666587ac579ac18da5
 2012-10-16 02:34:09 -04:00
Daniel Sandler
171786f439 am d0dee222: am 36074eec: am 1f075299: Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev 
* commit 'd0dee22255eb45e6e3640fdf05d2cc2393045dca':
  Allow any user to clear a notification targeted at USER_ALL.
 2012-10-15 22:30:47 -07:00
zzy
b49a896359 Add serial port profile support and allow to connect to rfcomm channel without sdp discovery 
bug 7272974

Change-Id: Idc10edc056b48da2fd96bea84eba3fb73b97bab1
 2012-10-15 22:30:29 -07:00
Daniel Sandler
d0dee22255 am 36074eec: am 1f075299: Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev 
* commit '36074eecccaaa52e535513829b9de13ac3930347':
  Allow any user to clear a notification targeted at USER_ALL.
 2012-10-15 22:28:24 -07:00
Daniel Sandler
36074eeccc am 1f075299: Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev 
* commit '1f0752993ffd4339cdf0e7d69b96093503bd2e24':
  Allow any user to clear a notification targeted at USER_ALL.
 2012-10-15 22:25:20 -07:00