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

92516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Satoshi Kataoka
4424951fa5 am 1e29e49c: Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev 
* commit '1e29e49cf8b2654f999b2fdb16e8f7f262b73c68':
  Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI
 2012-11-07 20:50:37 -08:00
Satoshi Kataoka
1e29e49cf8 Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev 2012-11-07 20:48:01 -08:00
Sascha Prueter
ef378ae204 am 14c89330: am de974f6f: am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev 
* commit '14c89330aefe3db10b53181f130f391061b8616a':
 2012-11-07 18:35:20 -08:00
Victoria Lease
5def893095 am d9da50ba: am eb6cbc22: am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev 
* commit 'd9da50ba0e06c86c03868660108e4d366f47acd5':
 2012-11-07 18:35:16 -08:00
Chris Wren
483483f85e am c0cbe8ab: am 8e3bf41d: Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev 
* commit 'c0cbe8ab5ef916d3c3d90831f93e559bc79636cc':
  add logging to enableUserSelectorIfNecessary.
 2012-11-07 18:35:13 -08:00
Chris Wren
29cc94898f am 74c5d53e: am b524f4b9: Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev 
* commit '74c5d53e2fd8e2e783f9126c0bb75fda2cfd210c':
  add some defensive code to enableUserSelectorIfNecessary.
 2012-11-07 18:35:09 -08:00
Daniel Sandler
5e6944bc00 am e4e6c97e: am 2d09880d: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev 
* commit 'e4e6c97ea40365e73ccf94c15b081887a0714a53':
 2012-11-07 18:35:06 -08:00
Baligh Uddin
24ee3595dc am 70869876: am 62e2374b: am 32226b73: (-s ours) Import translations. DO NOT MERGE 
* commit '7086987652213ac5870fb93dea3a8d78f1a3928b':
 2012-11-07 18:35:02 -08:00
Baligh Uddin
eeb747c559 am d9550886: am d44c4344: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit 'd9550886a88e4a6894aa28ed2ed8cdb63b67a385':
  Import translations. DO NOT MERGE
 2012-11-07 18:34:59 -08:00
Adam Cohen
fdfa4b7d52 am b579714c: am 8f837a69: Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)" into jb-mr1-lockscreen-dev 
* commit 'b579714c12fcf981a0ed172d6f7d48d5f65c2fab':
  Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)
 2012-11-07 18:34:55 -08:00
Baligh Uddin
5c89a59231 am 4d0e5e0e: am db60b675: am fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '4d0e5e0e152a91ccc63a382a9a8da8d21b16452d':
 2012-11-07 18:34:52 -08:00
Sascha Prueter
14c89330ae am de974f6f: am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev 
* commit 'de974f6f201a9aed3f811c97edf4db3ecd41eb3d':
 2012-11-07 18:29:40 -08:00
Victoria Lease
d9da50ba0e am eb6cbc22: am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev 
* commit 'eb6cbc22b264af26a20065942899a27abbc867eb':
 2012-11-07 18:29:33 -08:00
Chris Wren
c0cbe8ab5e am 8e3bf41d: Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev 
* commit '8e3bf41d8b2289fa96ea1b268946bacaa01a620c':
  add logging to enableUserSelectorIfNecessary.
 2012-11-07 18:29:30 -08:00
Chris Wren
74c5d53e2f am b524f4b9: Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev 
* commit 'b524f4b928fe3ac9c71657a323cff4b3321344da':
  add some defensive code to enableUserSelectorIfNecessary.
 2012-11-07 18:29:27 -08:00
Daniel Sandler
e4e6c97ea4 am 2d09880d: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev 
* commit '2d09880d0352895dcd7ae3d4cdca95e4503b23ed':
 2012-11-07 18:29:23 -08:00
Baligh Uddin
7086987652 am 62e2374b: am 32226b73: (-s ours) Import translations. DO NOT MERGE 
* commit '62e2374baa822bc98ef8e5ad8b10a55379433ef1':
 2012-11-07 18:29:20 -08:00
Baligh Uddin
d9550886a8 am d44c4344: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit 'd44c4344aa85ece3443ffdd410e9619650cbd39f':
  Import translations. DO NOT MERGE
 2012-11-07 18:29:16 -08:00
Adam Cohen
b579714c12 am 8f837a69: Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)" into jb-mr1-lockscreen-dev 
* commit '8f837a690b0da2579157cdcc30503e0dd67f429d':
  Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)
 2012-11-07 18:29:13 -08:00
Baligh Uddin
4d0e5e0e15 am db60b675: am fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'db60b67533f0e8e0366a926204bc852412285320':
 2012-11-07 18:29:10 -08:00
The Android Automerger
016b862c54 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-07 18:04:48 -08:00
Justin Koh
cd38c32d85 Merge "Catch exception of nonfound activities" into jb-mr1-aah-dev 2012-11-07 17:10:24 -08:00
Amith Yamasani
5ec00e930f Don't cancel any notifications that are meant for all users, if no package is specified. 
Bug: 7490028

Otherwise notifications such as the USB debugging and OTA notifications will be
dismissed when any user is stopped.

Change-Id: I0ae0c1136a999dd3aade99ca9e71c714b359eab4
 2012-11-07 16:58:30 -08:00
Irfan Sheriff
5c8e5585e2 am 1f6cf5fa: Merge "Re-use existing thread" into jb-mr1.1-dev 
* commit '1f6cf5fade6021c1ce788541ec4a60ee36d20651':
  Re-use existing thread
 2012-11-07 16:46:31 -08:00
Irfan Sheriff
1f6cf5fade Merge "Re-use existing thread" into jb-mr1.1-dev 2012-11-07 16:43:26 -08:00
Ben Pietrzak
6b1d912b25 Catch exception of nonfound activities 
Change-Id: Id019c71937e73c38eb7a7c0a0cccfc2b9e87d069
 2012-11-07 15:07:18 -08:00
John Spurlock
9a962d7c7d am 64091a1d: am 8aa62362: am ae73c690: Fix regression in camera transition. 
* commit '64091a1da0e87937ad42c8ae0d5e3dd3913b297b':
  Fix regression in camera transition.
 2012-11-07 15:06:45 -08:00
Michael Jurka
e4cc20d114 am 7dfbe2d6: am 3eaa876c: am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev 
* commit '7dfbe2d6a7a3d6f11d522f44b5339c7a6d3f2a1b':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly
 2012-11-07 15:06:41 -08:00
Jim Miller
449f48ff3b am bb9e7dca: am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views 
* commit 'bb9e7dcae96c8913050166c9cc949e9f1c3c8d1f':
  Workaround for layout bug in SIM PIN/PUK views
 2012-11-07 15:06:37 -08:00
Jim Miller
d3bd6eb8b2 am 16ddf343: am 8eb3048a: am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing 
* commit '16ddf343a61dfc93ff9a6fc4721b8fb16010da48':
  Fix NPE caused by applications that try to hide keyguard while it's not showing
 2012-11-07 15:06:33 -08:00
Svetoslav Ganov
63121bd6c1 am ab77b5e6: am e97c6faa: am bb8abae5: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev 
* commit 'ab77b5e6a251075fdfc7990f4d34a8d5896cfbce':
 2012-11-07 15:06:29 -08:00
Mike Cleron
fe583a7024 am d97d16f0: am f154c9bd: am 624ea441: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev 
* commit 'd97d16f0d1693657938a9c08099ad352d0946b6f':
 2012-11-07 15:06:26 -08:00
Romain Guy
39fe96c7b8 am c4101b2b: am a8e1d119: am 06da3378: am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev 
* commit 'c4101b2b96d7958e26da5a7b3d14cc2540f8002a':
 2012-11-07 15:06:22 -08:00
Adam Cohen
3e66286f7c Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev 2012-11-07 14:44:12 -08:00
Adam Cohen
f988bdfbae Fixing up glowpad scaling issues (issue 7494378) 
Change-Id: I55c0f7a3774d42d4f5893b12bc0c08690268e351
 2012-11-07 14:43:33 -08:00
Jean-Baptiste Queru
476fceaba3 Merge 5418dd92 
Change-Id: I50cd61c9dce55d528005b8d36dddf5cc62af89a8
 2012-11-07 14:41:18 -08:00
Sascha Prueter
61026ab15d am eb3aa44c: am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev 
* commit 'eb3aa44c10b155f917e8840d55b5bc1de3712ba9':
  Final icon for notifications panel
 2012-11-07 14:15:51 -08:00
Adam Powell
c717d110ae Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev 2012-11-07 14:14:24 -08:00
Sascha Prueter
de974f6f20 am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev 
* commit '972dd431f81432f1bbb33d2e7f34fcd5f4764870':
  Final icon for notifications panel
 2012-11-07 14:12:40 -08:00
Sascha Prueter
eb3aa44c10 am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev 
* commit '972dd431f81432f1bbb33d2e7f34fcd5f4764870':
  Final icon for notifications panel
 2012-11-07 14:12:33 -08:00
Sascha Prueter
972dd431f8 Merge "Final icon for notifications panel" into jb-mr1-dev 2012-11-07 14:08:22 -08:00
Adam Powell
eeb6255056 Fix keyguard measurement bugs 
Bug 7493748
Bug 7493764

Change-Id: I2182ec4347eefc80198e675684bc5d195f947763
 2012-11-07 14:07:46 -08:00
Victoria Lease
bf328b4043 am 4abe2d3d: am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev 
* commit '4abe2d3d367029080653818f538222603f13bed2':
  disable geofences for secondary users
 2012-11-07 14:03:55 -08:00
Victoria Lease
eb6cbc22b2 am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev 
* commit 'ad84f7f46b0207a7ad316b4df37c1f02c889cca9':
  disable geofences for secondary users
 2012-11-07 14:01:41 -08:00
Victoria Lease
4abe2d3d36 am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev 
* commit 'ad84f7f46b0207a7ad316b4df37c1f02c889cca9':
  disable geofences for secondary users
 2012-11-07 14:01:31 -08:00
Victoria Lease
ad84f7f46b Merge "disable geofences for secondary users" into jb-mr1-dev 2012-11-07 13:56:46 -08:00
Chris Wren
8e3bf41d8b Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev 2012-11-07 13:49:03 -08:00
Chris Wren
d2dec00a0a add logging to enableUserSelectorIfNecessary. 
Bug: 7437751
Change-Id: I4a223ac68f780dac212ee5ed0729d59278fd1e4b
 2012-11-07 16:38:33 -05:00
The Android Automerger
02253f4893 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-07 13:05:55 -08:00
Irfan Sheriff
cd3d75f35d Re-use existing thread 
Bug: 7377541
Change-Id: I097f2288ebfc2b4a9782cbced19d9c36d0703acb
 2012-11-07 13:02:08 -08:00