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

114891 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
4099dc8981 am 9bf6c5ce: Merge "Fix method for determining focused window." into klp-dev 
* commit '9bf6c5cec834343104aa326b65b86c064c86c6cb':
  Fix method for determining focused window.
 2013-09-24 12:35:25 -07:00
Craig Mautner
9bf6c5cec8 Merge "Fix method for determining focused window." into klp-dev 2013-09-24 19:33:17 +00:00
Lajos Molnar
9ae69e73af am 6ce2967f: am 566d6b65: Merge "WebVttRenderer: allow BOM at beginning of a WebVTT file." into klp-dev 
* commit '6ce2967fa4e9c2a8f8dab741c58c622bacb34a4c':
  WebVttRenderer: allow BOM at beginning of a WebVTT file.
 2013-09-24 11:41:52 -07:00
Lajos Molnar
6ce2967fa4 am 566d6b65: Merge "WebVttRenderer: allow BOM at beginning of a WebVTT file." into klp-dev 
* commit '566d6b653466a4aed3a47b13ec03171912c48287':
  WebVttRenderer: allow BOM at beginning of a WebVTT file.
 2013-09-24 11:39:41 -07:00
Alan Viverette
5fbd62b399 am 36055c33: am e1cb9acc: Merge "Update AdapterView.performItemClick() documentation" into klp-dev 
* commit '36055c3396051e1f1e0257b9e98c0b9b5ac16080':
  Update AdapterView.performItemClick() documentation
 2013-09-24 11:38:18 -07:00
Lajos Molnar
566d6b6534 Merge "WebVttRenderer: allow BOM at beginning of a WebVTT file." into klp-dev 2013-09-24 18:37:12 +00:00
Alan Viverette
36055c3396 am e1cb9acc: Merge "Update AdapterView.performItemClick() documentation" into klp-dev 
* commit 'e1cb9accf2077833c96e748150d0aee8e05cb10a':
  Update AdapterView.performItemClick() documentation
 2013-09-24 11:32:41 -07:00
Alan Viverette
e1cb9accf2 Merge "Update AdapterView.performItemClick() documentation" into klp-dev 2013-09-24 18:28:01 +00:00
Alan Viverette
99d72497d3 Fix NPE in PopupMenu.getDragToOpenListener() 
BUG: 10912382
Change-Id: I206e697b4781c4d03ebc01aa675511d89c1656af
 2013-09-24 11:27:08 -07:00
Craig Mautner
15a0436ac4 am a52bfb9f: am 254f5ffc: Merge "Pause activities behind keyguard after boot." into klp-dev 
* commit 'a52bfb9fe4d8f28ccb6bc3eda37250f0d3aeb8d4':
  Pause activities behind keyguard after boot.
 2013-09-24 10:46:56 -07:00
Craig Mautner
a52bfb9fe4 am 254f5ffc: Merge "Pause activities behind keyguard after boot." into klp-dev 
* commit '254f5ffc47fe26d48fe3fd9f3bc513805dd04ac5':
  Pause activities behind keyguard after boot.
 2013-09-24 10:43:53 -07:00
Craig Mautner
254f5ffc47 Merge "Pause activities behind keyguard after boot." into klp-dev 2013-09-24 17:39:17 +00:00
Craig Mautner
2acc389d61 Pause activities behind keyguard after boot. 
Following boot the initial activity was automatically resumed even if
a lockscreen is obscuring it. Refer to CL 363859 for why this breaks
things.

This fix pauses all activities the first time a lockscreen appears.

Completes the fix for bug 10732489.

Change-Id: I6fcac14b574c495aa0e16d798cddc1263c6b4c25
 2013-09-24 10:36:05 -07:00
Jean-Michel Trivi
62719220a1 am e783ffab: am bc05918c: Merge "Public API for peak and RMS monitoring through the Visualizer effect" into klp-dev 
* commit 'e783ffab89dbe612a4865a1a1e1a7814522b0ef4':
  Public API for peak and RMS monitoring through the Visualizer effect
 2013-09-24 10:26:46 -07:00
Baligh Uddin
0750a14ae5 am 4452a3f5: (-s ours) am 89104790: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4452a3f591466b32fdaefc7e2138020a77a1aadd':
  Import translations. DO NOT MERGE
 2013-09-24 10:26:40 -07:00
Baligh Uddin
46cf5f0161 am 132f50cd: (-s ours) am 71a5f3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '132f50cddf0dcd3ab207890959c6e003a70e4766':
  Import translations. DO NOT MERGE
 2013-09-24 10:26:36 -07:00
Baligh Uddin
db409ac0f5 am 0c47508c: (-s ours) am 87ac87a5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '0c47508cf3c495124287db057f412f52c92263b6':
  Import translations. DO NOT MERGE
 2013-09-24 10:26:33 -07:00
Martin Kosiba
8ed79f45d6 am dc7053be: am 4e31b804: Merge "Update WebView documentation section about zoom." into klp-dev 
* commit 'dc7053be9ff1b89464063ed6a338fd29580b5abf':
  Update WebView documentation section about zoom.
 2013-09-24 10:26:10 -07:00
Zhijun He
1562ca8bf5 am ff704b63: am 0d9fdc24: Merge "Camera2: replace EDQUOT with EUSERS" into klp-dev 
* commit 'ff704b63dda946531b7e3774b2ac4211f63349c3':
  Camera2: replace EDQUOT with EUSERS
 2013-09-24 10:25:56 -07:00
Jim Miller
53fba32945 am c8f00291: am 89e1fec9: Merge "Fit and finish for navbar camera affordance" into klp-dev 
* commit 'c8f00291f670cb3741347c82b615a110f5729c6f':
  Fit and finish for navbar camera affordance
 2013-09-24 10:23:15 -07:00
Jim Miller
8ecb292f2b am 9c4c61d0: am 81f429e0: Merge "Enable RTL support in keyguard" into klp-dev 
* commit '9c4c61d08e8249ec6b0124342873324a0e2f7162':
  Enable RTL support in keyguard
 2013-09-24 10:23:12 -07:00
David Christie
49580f5ce4 am f6a63c92: am fe538cb6: Merge "Fix broken method WorkSource.set (names aren\'t applied)." into klp-dev 
* commit 'f6a63c92448be250208556520900c4309917a010':
  Fix broken method WorkSource.set (names aren't applied).
 2013-09-24 10:23:09 -07:00
Svetoslav Ganov
3e65abdf26 am 5bf43d25: am 5dfccc3c: Merge "The current is printer not refreshed when selected." into klp-dev 
* commit '5bf43d253c13cb18c9026cde147b10fc5676b1c4':
  The current is printer not refreshed when selected.
 2013-09-24 10:23:05 -07:00
Jean-Michel Trivi
30231077a7 am b25f2640: am e9b0dd89: Merge "Add audio level monitoring capabilities in Visualizer effect" into klp-dev 
* commit 'b25f26405234f5f8e98467f4f09184990dd5a496':
  Add audio level monitoring capabilities in Visualizer effect
 2013-09-24 10:23:01 -07:00
Dianne Hackborn
e1cf0f6acf am d79c8671: am 2d4eee38: Merge "Implement issue #10895990: Better durations for proc stats" into klp-dev 
* commit 'd79c8671eca337b037ee0dda67fb831c26a34935':
  Implement issue #10895990: Better durations for proc stats
 2013-09-24 10:22:58 -07:00
Wink Saville
5a588cd42b am cda884d5: am d3890496: Merge "Add RIL_REQUEST_SET_INITIAL_ATTACH_APN." into klp-dev 
* commit 'cda884d5c0686a946a3d6480d14271a6b49ef231':
  Add RIL_REQUEST_SET_INITIAL_ATTACH_APN.
 2013-09-24 10:22:56 -07:00
Jeff Sharkey
f534dc6c36 am 94bf4d69: am 0156a379: Merge "Allow saving to Downloads." into klp-dev 
* commit '94bf4d69f2e59a0bb62c5d1829e4cf9be5a67579':
  Allow saving to Downloads.
 2013-09-24 10:22:53 -07:00
Amith Yamasani
d94c31d13a am 32a2775e: am 85f77c2b: Merge "Unmarshall PFDs properly when hand-crafting interface stubs" into klp-dev 
* commit '32a2775e529d13dfd34273a3b4af5151435720b2':
  Unmarshall PFDs properly when hand-crafting interface stubs
 2013-09-24 10:22:50 -07:00
Katie McCormick
4ba9c875de am 4418f660: am ba0fa9ce: am 50756ccc: am 77364631: am a9fcf662: Merge "New Scheduling class." into jb-mr2-docs 
* commit '4418f660b486a46f205992bf8580a724ad2a76e9':
  New Scheduling class.
 2013-09-24 10:22:46 -07:00
John Spurlock
93c672e695 am 237b8428: am fac17cc7: Merge "Introduce transparent bars to the keyguard." into klp-dev 
* commit '237b84287e1fe135af957775f53a6be999b618a2':
  Introduce transparent bars to the keyguard.
 2013-09-24 10:22:43 -07:00
Ken Sumrall
e93eeece2c am 757dcfc3: am d3fbba15: Merge "Upload fsck logs to the dropbox when error found" into klp-dev 
* commit '757dcfc37236c7dd5ef13a81ad9dac5d47ef7fe1':
  Upload fsck logs to the dropbox when error found
 2013-09-24 10:22:39 -07:00
Dianne Hackborn
e941dee66f am 8db6517e: am ba0abd0a: Merge "Fix issue #10876433: java.lang.IllegalStateException in..." into klp-dev 
* commit '8db6517e846a6ee43d4ce19f7b5b2c5a351a2122':
  Fix issue #10876433: java.lang.IllegalStateException in...
 2013-09-24 10:22:34 -07:00
Derek Sollenberger
5380709c78 am fad41c8f: am 5db1f5aa: Merge "Fix Java API error where requesting another style for a provided family fails" into klp-dev 
* commit 'fad41c8fd1024a8257bdced18dbcbc9cd67e407a':
  Fix Java API error where requesting another style for a provided family fails
 2013-09-24 10:22:29 -07:00
Dianne Hackborn
a0faa41254 am dc655c0e: am 4bf0fcef: Merge "Work on issue #10759595: preferred tag doesn\'t prevent..." into klp-dev 
* commit 'dc655c0e0742bcc4834773a8aacb8b7d67a73aad':
  Work on issue #10759595: preferred tag doesn't prevent...
 2013-09-24 10:22:25 -07:00
Craig Mautner
f420a76e62 am c96218a0: am e14d0c21: Merge "Ensure that activities behind keyguard are paused." into klp-dev 
* commit 'c96218a0575f7f5816104d38365c68a21c7b9ea6':
  Ensure that activities behind keyguard are paused.
 2013-09-24 10:22:22 -07:00
Vinit Deshapnde
ad93dc7f5c am 10914a23: am 662c326e: Merge "Allow yet another combination of key management options" into klp-dev 
* commit '10914a23f71b42a2b9d08a0199689d84117d5e0c':
  Allow yet another combination of key management options
 2013-09-24 10:22:18 -07:00
Matthew Williams
9f584e576f am 05b51688: (-s ours) am 75256476: Merge "fix deadlock caused by clearAllBackoffs in SSE" into klp-dev 
* commit '05b51688f656700f3b5a06ea9664c88215a07494':
  fix deadlock caused by clearAllBackoffs in SSE
 2013-09-24 10:22:14 -07:00
Lajos Molnar
283fe37aa2 WebVttRenderer: allow BOM at beginning of a WebVTT file. 
This is part of the spec.

Change-Id: I61ccc259c0b9d3a2bc4273925665d107b0c89c62
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10900755
 2013-09-24 10:13:43 -07:00
Craig Mautner
ac56514ea7 Fix method for determining focused window. 
Method had been rewritten to be task-based and there were errors
when a task had no apptokens. New version is much easier to
maintain.

Maybe fixes bug 10689184.

Change-Id: I5e4c8447a33a4f5686296c20b9f9fe302c9ae49f
 2013-09-24 09:01:48 -07:00
Jean-Michel Trivi
e783ffab89 am bc05918c: Merge "Public API for peak and RMS monitoring through the Visualizer effect" into klp-dev 
* commit 'bc05918c88fe9450008ba3adf6caed6afa46550b':
  Public API for peak and RMS monitoring through the Visualizer effect
 2013-09-24 08:51:48 -07:00
Jean-Michel Trivi
bc05918c88 Merge "Public API for peak and RMS monitoring through the Visualizer effect" into klp-dev 2013-09-24 15:44:56 +00:00
Baligh Uddin
4452a3f591 am 89104790: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '891047901f025fd031346c29643709526d88aba8':
  Import translations. DO NOT MERGE
 2013-09-24 08:00:20 -07:00
Baligh Uddin
132f50cddf am 71a5f3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '71a5f3cefef8269dba2dcf86d9ea7eee3c88dcca':
  Import translations. DO NOT MERGE
 2013-09-24 08:00:17 -07:00
Baligh Uddin
0c47508cf3 am 87ac87a5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '87ac87a5e504b4e3d2a8fed9a6adb66d2d775b60':
  Import translations. DO NOT MERGE
 2013-09-24 08:00:15 -07:00
Baligh Uddin
2ff9b6ad57 Merge "Import translations. DO NOT MERGE" 2013-09-24 14:59:34 +00:00
Baligh Uddin
891047901f Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-24 14:59:27 +00:00
Baligh Uddin
872b036270 Merge "Import translations. DO NOT MERGE" 2013-09-24 14:59:16 +00:00
Baligh Uddin
71a5f3cefe Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-24 14:59:07 +00:00
Baligh Uddin
e0a2e43a13 Merge "Import translations. DO NOT MERGE" 2013-09-24 14:58:12 +00:00
Baligh Uddin
87ac87a5e5 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-24 14:58:07 +00:00