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

94956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
40daf33c02 am 998d03bd: Merge "A new clock widget to create lock screen appwidgets" into jb-mr1-dev 
* commit '998d03bd943053741bab17a8ef0abb355f6bc3ae':
  A new clock widget to create lock screen appwidgets
 2012-11-01 11:25:49 -07:00
Romain Guy
998d03bd94 Merge "A new clock widget to create lock screen appwidgets" into jb-mr1-dev 2012-11-01 11:23:17 -07:00
Adam Powell
5ee6ba6158 Keyguard tablet/portrait fix for HUGE security views 
Integrate from proto app

Bug 7453420

Change-Id: I3dca6e4d96c319c17ee52e13616c15db085b1c97
 2012-11-01 11:22:55 -07:00
Scott Main
277b352d9f docs: update description for location permissions 
bug: 6996667

Change-Id: I3b5d706d98b56386a88b33a343721ff7432063b9
 2012-11-01 10:55:02 -07:00
Scott Main
22d17c984a docs: misc changes for new manifest attributes, 
including fix for bug 7443821
bug 7442263

Change-Id: I20b712bf2b0379c70ff28682025d6f30817a6c36
 2012-11-01 10:39:41 -07:00
Scott Main
b27e95778a am 9e413a3e: am 985e9b8d: am 8761e143: docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing 
* commit '9e413a3e78b2e65f4e4e4f230f086775a7512296':
  docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing
 2012-11-01 10:06:52 -07:00
John Spurlock
22ad682ad7 Merge "Cancel camera launch on screen off." into jb-mr1-lockscreen-dev 2012-11-01 10:05:40 -07:00
Scott Main
9e413a3e78 am 985e9b8d: am 8761e143: docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing 
* commit '985e9b8d49ea613d902368bb4a4777ed269802a3':
  docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing
 2012-11-01 10:04:51 -07:00
John Spurlock
dbe24b7def Cancel camera launch on screen off. 
Bug: 7452793
Change-Id: Ic043a0076154d2ce4dcb0b26bae3958c35a6cd67
 2012-11-01 13:01:05 -04:00
Scott Main
89c359c8ee am 8761e143: docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing 
* commit '8761e143c987fc48d854818988cde44700c9f602':
  docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing
 2012-11-01 09:58:58 -07:00
Scott Main
985e9b8d49 am 8761e143: docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing 
* commit '8761e143c987fc48d854818988cde44700c9f602':
  docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing
 2012-11-01 09:58:40 -07:00
Daniel Sandler
62e9c05774 Merge "Show the keyboard less aggressively." into jb-mr1-lockscreen-dev 2012-11-01 09:56:17 -07:00
Scott Main
8761e143c9 docs: Clarify the callback mechanisms for LocationRequest 
and clarify horizontal geofencing

Change-Id: I8ff264d7a12c8ec3c79854e008aeeb5f922ad459
 2012-11-01 09:54:15 -07:00
The Android Open Source Project
f63ee450b4 am dddeb53f: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'dddeb53fd61c76b4e2f694f77c67ce821feef74f':
 2012-11-01 07:54:51 -07:00
The Android Open Source Project
dddeb53fd6 Reconcile with jb-mr1-release - do not merge 
Change-Id: I412cbce1e453fb33c6706c8b194957e6b36eff58
 2012-11-01 07:52:02 -07:00
John Spurlock
6e36f1019c Fix launcher flash during secure camera transition. 
Bug:7452928
Change-Id: I8b7d9bdb14addefb9e9ed71a45d438418b3e21dd
 2012-11-01 09:15:53 -04:00
Zhihai Xu
d31c32217c Fix for BluetoothAdapter.getAddress() when BT is off on some devices 
There are two problem, 1.If we have wrong bluetooth address in
global settings db, we never will update it 2. We need enable bluetooth
to get the bluetooth address for some devices. For 1, we fix it by add
a valid flag in global setting db, this flag will be set when we stored
correct address and name to db. We only load the name and address from
global setting db when this valid flag is set during power up.
For2. we will read BT address after bluetooth is at ON state.
bug 7440409

Change-Id: Ic4740b3f0b2fcd214c7ca8393f7331c140eec66d
 2012-11-01 02:19:08 -07:00
Danielle Millett
080471e410 Merge "Updating isShowing during onResume()" into jb-mr1-lockscreen-dev 2012-10-31 21:44:05 -07:00
Xia Wang
e6f2f6cffd am 33185d4f: am f1e32af5: am c86e8dff: Merge "Fix WiFi stress test" into jb-mr1-dev 
* commit '33185d4f68b533e1289d1dcc1d88e43fe8462450':
  Fix WiFi stress test
 2012-10-31 21:26:11 -07:00
Xia Wang
33185d4f68 am f1e32af5: am c86e8dff: Merge "Fix WiFi stress test" into jb-mr1-dev 
* commit 'f1e32af5ae629a1a0f73ee12aa6390ea9e527d32':
  Fix WiFi stress test
 2012-10-31 21:23:31 -07:00
Xia Wang
f1e32af5ae am c86e8dff: Merge "Fix WiFi stress test" into jb-mr1-dev 
* commit 'c86e8dffd04804f7f975c80325bc3ae70e7e972a':
  Fix WiFi stress test
 2012-10-31 21:20:38 -07:00
Xia Wang
d0fb412cda am c86e8dff: Merge "Fix WiFi stress test" into jb-mr1-dev 
* commit 'c86e8dffd04804f7f975c80325bc3ae70e7e972a':
  Fix WiFi stress test
 2012-10-31 21:20:33 -07:00
Xia Wang
c86e8dffd0 Merge "Fix WiFi stress test" into jb-mr1-dev 2012-10-31 21:18:36 -07:00
Danielle Millett
5d2404da57 Updating isShowing during onResume() 
Since the callback is unregistered in onPause(), KeyguardFaceUnlock
doesn't get onKeyguardVisibilityChanged() when it's paused.  This means
that if the state changes while it's paused, then mIsShowing is incorrect
when it resumes.  This is fixed by keeping track of the state in
KeyguardUpdateMonitor and checking it when onResume() is called.

Change-Id: I67aa1e091161a965e4347dc8c2ec5e7a1dd9d92e
 2012-11-01 00:05:27 -04:00
Michael Jurka
2fd2fe3348 am 345c0fa0: am 40d90211: am c8dc8eb3: Merge "Use new keyguard appwidget picker" into jb-mr1-lockscreen-dev 
* commit '345c0fa06c246efde48526fd56e0830678e1759b':
  Use new keyguard appwidget picker
 2012-10-31 20:39:48 -07:00
Adam Powell
919227abe3 am 65d33bac: am 302b6819: am 077105ba: Merge "Fix some drag behavior bugs in keyguard" into jb-mr1-lockscreen-dev 
* commit '65d33bacd7b2a85147763a9e025effe306ad3741':
  Fix some drag behavior bugs in keyguard
 2012-10-31 20:39:43 -07:00
Chet Haase
6963e30bd9 am c854c101: am 437e1a9c: am 4f721f10: am fe28ff0d: Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev 
* commit 'c854c1019df1477cbfd88b86e45b4309ace54da7':
 2012-10-31 20:39:39 -07:00
Jeff Brown
0abf44cad7 am ae8de95c: am ba16031a: am 409c89c3: am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev 
* commit 'ae8de95cf2b3c35f842b2d1fc0394793fe2737a0':
 2012-10-31 20:39:35 -07:00
Raph Levien
fbd7222240 am 65a33ecd: am 19d7cc38: am 688d0381: am c01d1045: Merge "Fix for bug 7400445 regression in background drawable" into jb-mr1-dev 
* commit '65a33ecd509a1a00c2e10b2bb3949b82b88339cf':
 2012-10-31 20:39:31 -07:00
Baligh Uddin
f6377acd09 am 011ab04e: am 28ce2ed9: am 4bce83ee: am 9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev 
* commit '011ab04ec2427c2d790c00e21847e48e11c25bc1':
 2012-10-31 20:39:26 -07:00
Baligh Uddin
f7c90b7c34 am 11b7ec20: (-s ours) am 7960244c: am 13d02d04: am 83e9187d: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 
* commit '11b7ec201d8f41d601dd58c04ce651c7117a44c2':
 2012-10-31 20:39:21 -07:00
Baligh Uddin
c3ebc42005 am 277f8639: (-s ours) am 7a767180: am 47f52d75: am a68aa4e3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '277f8639b93a3aa6074957f5e7895b2cf0d53eb1':
 2012-10-31 20:39:18 -07:00
Baligh Uddin
05ff717bac am 13392856: am f97b62bd: am 6697c682: am dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev 
* commit '13392856be16d60e868738325c198f2fb98ab777':
 2012-10-31 20:39:15 -07:00
Svetoslav Ganov
3daa9c3bc4 am b5447463: am 0c777537: am cdb80888: Merge "Fix keypad accessibility." into jb-mr1-lockscreen-dev 
* commit 'b5447463654a2aa319cb33c266b688391f529dfc':
  Fix keypad accessibility.
 2012-10-31 20:39:11 -07:00
Baligh Uddin
5d8c83cca7 am 87cae399: (-s ours) am 22815f1d: am 0e06223c: am 6bd881bd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '87cae3993a2c7cbe916b0616140fe52862ad161c':
 2012-10-31 20:39:07 -07:00
Svetoslav Ganov
cac01f94dc am 6525efaf: am 708d8db9: am 51cfc540: Merge "Accessibility of the lock screen - strings" into jb-mr1-lockscreen-dev 
* commit '6525efafa995182271a22a44eabddd8dc009acdf':
  Accessibility of the lock screen - strings
 2012-10-31 20:39:02 -07:00
Amith Yamasani
4afe76f050 am 5c8c2ac3: am 53bcda4f: am 7f5bade1: am 03f7ebfe: Merge "Relax permission requirements for posting notifications across users" into jb-mr1-dev 
* commit '5c8c2ac3b0b3a5f6ac7453dcb2b70ea99371b336':
 2012-10-31 20:38:55 -07:00
Jim Miller
96d9e1d0e5 am ea6c15ef: am 57dcf248: am 170c8d93: Merge "Remove extra KeyguardViewStateManager construction" into jb-mr1-lockscreen-dev 
* commit 'ea6c15ef501bd30943d525f3cafccfd8057007a8':
  Remove extra KeyguardViewStateManager construction
 2012-10-31 20:38:51 -07:00
Chris Wren
2ac2b4d41b am 594a1918: am 5bbf7ef8: am f778bfdf: Merge "Update bouncer behavior on tablets." into jb-mr1-lockscreen-dev 
* commit '594a1918efb0b58d50d121655876f489b111bb19':
  Update bouncer behavior on tablets.
 2012-10-31 20:38:47 -07:00
Baligh Uddin
43c7320f9f am 17e08407: (-s ours) am 971c086e: (-s ours) am 5b039844: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-lockscreen-dev 
* commit '17e08407f87a061bc89e850450585000d950f93c':
  Revert "Import translations. DO NOT MERGE"
 2012-10-31 20:38:42 -07:00
Michael Jurka
345c0fa06c am 40d90211: am c8dc8eb3: Merge "Use new keyguard appwidget picker" into jb-mr1-lockscreen-dev 
* commit '40d90211fe038219ef6595a8d56e5d9b390e2f89':
  Use new keyguard appwidget picker
 2012-10-31 20:35:57 -07:00
Adam Powell
65d33bacd7 am 302b6819: am 077105ba: Merge "Fix some drag behavior bugs in keyguard" into jb-mr1-lockscreen-dev 
* commit '302b6819cdedefff5d7ec74133bf73a461eab99f':
  Fix some drag behavior bugs in keyguard
 2012-10-31 20:35:53 -07:00
Chet Haase
c854c1019d am 437e1a9c: am 4f721f10: am fe28ff0d: Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev 
* commit '437e1a9c5bbb7929e5379813888edee489c09e70':
 2012-10-31 20:35:50 -07:00
Jeff Brown
ae8de95cf2 am ba16031a: am 409c89c3: am c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev 
* commit 'ba16031aa15713ea2ed979d40be02b7ca99d4990':
 2012-10-31 20:35:46 -07:00
Raph Levien
65a33ecd50 am 19d7cc38: am 688d0381: am c01d1045: Merge "Fix for bug 7400445 regression in background drawable" into jb-mr1-dev 
* commit '19d7cc3814c59fcedb7d181c3fb17b3e8bb4ed00':
 2012-10-31 20:35:42 -07:00
Baligh Uddin
011ab04ec2 am 28ce2ed9: am 4bce83ee: am 9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev 
* commit '28ce2ed9ba8148626cecfec5b6501847f5c1e3e0':
 2012-10-31 20:35:39 -07:00
Baligh Uddin
11b7ec201d am 7960244c: am 13d02d04: am 83e9187d: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 
* commit '7960244c499049e231043e760452f32070ae8493':
 2012-10-31 20:35:36 -07:00
Baligh Uddin
277f8639b9 am 7a767180: am 47f52d75: am a68aa4e3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '7a7671807c9d0ffafb4a70335d9adfc81b723ed6':
 2012-10-31 20:35:31 -07:00
Baligh Uddin
13392856be am f97b62bd: am 6697c682: am dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev 
* commit 'f97b62bd18094b69f120341ae1dd98df8d0d23f7':
 2012-10-31 20:35:27 -07:00
Svetoslav Ganov
b544746365 am 0c777537: am cdb80888: Merge "Fix keypad accessibility." into jb-mr1-lockscreen-dev 
* commit '0c77753749bf0372a3876ba5f8a45d497208614c':
  Fix keypad accessibility.
 2012-10-31 20:35:24 -07:00