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

5971 Commits

Author SHA1 Message Date
Danielle Millett
855bdf6500 am 85a4ac92: am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev 
* commit '85a4ac9281f5e592dead0f20146e4f154efd7c78':
  Face Unlock is shown correctly during a phone call - fix b/7271718
 2012-10-11 17:11:50 -07:00
Adam Cohen
6879426372 am 2514cbc2: am e60cdf12: Merge "Final keyguard tablet layout integration" into jb-mr1-dev 
* commit '2514cbc218923cb5e2270ebd9be19d2c9aad356e':
  Final keyguard tablet layout integration
 2012-10-11 17:11:13 -07:00
Danielle Millett
8f89e6f8e6 Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev 2012-10-11 12:07:38 -07:00
Adam Cohen
e60cdf1291 Merge "Final keyguard tablet layout integration" into jb-mr1-dev 2012-10-11 11:08:19 -07:00
Baligh Uddin
eb214524be Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-10 21:16:53 -07:00
Jim Miller
71b3cd56a6 Final keyguard tablet layout integration 
This change integrates the finalized tablet layouts for keyguard.  It supports
both 7" and 10" tablets and makes some minor tweaks on phones.

Bug 7094419

Change-Id: I7b683382974de509e8045210544ea959db82e72d
 2012-10-10 19:02:40 -07:00
Svetoslav Ganov
8444b247e5 am 3c409d5b: am 33ee2900: Merge "Update to accessibility toggle message." into jb-mr1-dev 
* commit '3c409d5bfadd6b2eb4a2e3083aef0a65ce7cf815':
  Update to accessibility toggle message.
 2012-10-10 15:07:31 -07:00
Baligh Uddin
521da7ec67 Import translations. DO NOT MERGE 
Change-Id: I57efb052a4003b16c6901ea8af12efcd535d1e4c
Auto-generated-cl: translation import
 2012-10-10 13:15:41 -07:00
Casey Burkhardt
8af30c0ee5 Update to accessibility toggle message. 
Change-Id: I9957b86f3424d800b1b9804dc77f5bc5b728922b
 2012-10-10 10:51:56 -07:00
Baligh Uddin
f72c9d0309 am 07cfed1b: am 64ad9540: Merge "Revert "Revert "Add config resource to help ATT prepaid""" into jb-mr1-dev 
* commit '07cfed1b4f1ea04cf551c886e07f4318cfc11006':
  Revert "Revert "Add config resource to help ATT prepaid""
 2012-10-09 19:20:15 -07:00
Baligh Uddin
64ad954085 Merge "Revert "Revert "Add config resource to help ATT prepaid""" into jb-mr1-dev 2012-10-09 19:14:37 -07:00
Baligh Uddin
b7c6a62a09 Revert "Revert "Add config resource to help ATT prepaid"" 
Revert the revert - change is good.

This reverts commit 2133caf515660d957bb7fd05b35e7eb2f2391d48

Change-Id: I987d5533e8ce909a3adfa38bceeac5c42e22da19
 2012-10-09 19:13:31 -07:00
Baligh Uddin
54f0cb4846 am 3decc4b5: am 2aee7c18: Merge "Revert "Add config resource to help ATT prepaid"" into jb-mr1-dev 
* commit '3decc4b59764c4fbd0b8630606dae325c414bf3a':
  Revert "Add config resource to help ATT prepaid"
 2012-10-09 18:00:26 -07:00
Baligh Uddin
2aee7c1843 Merge "Revert "Add config resource to help ATT prepaid"" into jb-mr1-dev 2012-10-09 17:53:37 -07:00
Baligh Uddin
2133caf515 Revert "Add config resource to help ATT prepaid" 
breaking jb-mr1-release

This reverts commit 901ac560cafe0b8d76fd7441cbaf8749be33577c

Change-Id: I5fab4097a40e0ba31dc716967ef921c113a795a7
 2012-10-09 17:52:52 -07:00
Danielle Millett
61413b5ed2 Face Unlock is shown correctly during a phone call - fix b/7271718 
If the user was in the middle of a phone call and went to the lock screen
it would show a black box with an X, but Face Unlock wouldn't pop up and
the X was unresponsive.

There were a few issues causing this.  The X on the default view wasn't a
button, so it has been changed to a button which will go to the backup
lock.  The concept of show() and hide() in FaceUnlock.java are obsolete
because Face Unlock is no longer being overlayed on top of the backup so
there's isn't a black box to show or hide. In addition, since it's not being
overlayed, Face Unlock doesn't cover the backup lock so fading to the backup
looks janky.  The flip animation is more appropriate.

Change-Id: I730aa4bbce42b4656ee1bce61352b8aefbd6892d
 2012-10-09 18:15:49 -04:00
Robert Greenwalt
6f4fcc73b4 am b24373e0: am 64cb35c0: Merge "Add config resource to help ATT prepaid" into jb-mr1-dev 
* commit 'b24373e04a767d81d2f58c1398495214ef181328':
  Add config resource to help ATT prepaid
 2012-10-09 13:34:07 -07:00
Adam Powell
d338b9775b am db380410: am 16062128: Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev 
* commit 'db38041002c6c9f297e8c8c1eade6471646045b2':
  Allow more scaling values to be tuned in resource overlays
 2012-10-09 13:29:38 -07:00
Robert Greenwalt
64cb35c078 Merge "Add config resource to help ATT prepaid" into jb-mr1-dev 2012-10-09 13:27:45 -07:00
Adam Powell
160621280d Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev 2012-10-09 13:25:12 -07:00
Robert Greenwalt
901ac560ca Add config resource to help ATT prepaid 
bug:7306353
Change-Id: I8da9e7591ad5e28d5b319df11435333da44fb7d3
 2012-10-09 12:20:08 -07:00
Eric Laurent
69427e3515 am 542e0afa: am 14dfe4e0: Merge "enforce camera sound according to country code" into jb-mr1-dev 
* commit '542e0afa5114583f357d6f65ede036a444f694e7':
  enforce camera sound according to country code
 2012-10-09 11:35:08 -07:00
Eric Laurent
14dfe4e0ab Merge "enforce camera sound according to country code" into jb-mr1-dev 2012-10-09 11:29:11 -07:00
Adam Powell
3307958c6b Allow more scaling values to be tuned in resource overlays 
Bug 7267507

Change-Id: I3fba6882a0ac4cb7d34430ba36dec83c030a73cd
 2012-10-09 11:21:08 -07:00
Jim Miller
85849d4cde am d1c0e980: am 0c9b5359: Merge "Fix "checking account" string" into jb-mr1-dev 
* commit 'd1c0e98076524f3a8bcd6e2a31bc975321088a50':
  Fix "checking account" string
 2012-10-08 17:31:29 -07:00
Jim Miller
0c9b5359bd Merge "Fix "checking account" string" into jb-mr1-dev 2012-10-08 17:26:22 -07:00
Eric Laurent
dd45d01128 enforce camera sound according to country code 
Use mcc config overlay mechanism to enforce camera shutter sounds
in countries where it is mandatory.
Property ro.camera.sound.forced is not needed anymore.
When camera sound is forced, STREAM_SYSTEM_ENFORCED is removed from
streams affected by ringer mode and its volume is
maxed out. AudioSystem.FORCE_SYSTEM_ENFORCED is sent to audio
policy manager to alter the routing policy for STREAM_SYSTEM_ENFORCED.

Also fix streams being unmuted when settings are reloaded
upon user switch while in silent mode.

Add ringer mode to audio service dump.

Bug 7032634.

Change-Id: Iceea5bba3b8d3aabf8e42b222deb33a893dc8f38
 2012-10-08 17:00:02 -07:00
Jim Miller
6c5bd361fe Fix "checking account" string 
Fixes bug 7309934

Change-Id: Ia665142b8dcd8de424312bd7bf0800d7b871b03b
 2012-10-08 16:38:50 -07:00
Dianne Hackborn
a4c88ee991 am 1b94df8a: am 4efbab48: Merge "Framework side of issue #7302511: GCM client needs to use new framework API..." into jb-mr1-dev 
* commit '1b94df8af9a6922bfba7e2ecca24bb0d7578a8e2':
  Framework side of issue #7302511: GCM client needs to use new framework API...
 2012-10-08 15:15:36 -07:00
Dianne Hackborn
4efbab480d Merge "Framework side of issue #7302511: GCM client needs to use new framework API..." into jb-mr1-dev 2012-10-08 15:02:56 -07:00
Baligh Uddin
46c2699824 Import translations. DO NOT MERGE 
Change-Id: I8dd8dacad06a9f7be27ac666f7fc4a51308347aa
Auto-generated-cl: translation import
 2012-10-08 14:47:48 -07:00
Dianne Hackborn
36d337adff Framework side of issue #7302511: GCM client needs to use new framework API... 
...to fix background->shutdown delivery race

Add ACTION_STOPPING and ACTION_STARTING to allow such apps to keep track of
which users are started/stopped, and be involved in the process of stopping
a user.

Also get rid of the scale part of the wallpaper transitions, since it seems
like I have still failed at getting the user switch to wait until the new
wallpaper is displayed.

Change-Id: If7e8fdae3544a9d7987a1b9274dc8b49022f6f62
 2012-10-08 14:33:47 -07:00
Baligh Uddin
0e2aade9f1 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-08 08:29:02 -07:00
Craig Mautner
337aa27a63 am 8ee7ac22: am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev 
* commit '8ee7ac22e6aec5df5405a3e2130d593c50bc39b2':
  Adds showWhenLocked attribute to Activities.
 2012-10-07 11:53:43 -07:00
Craig Mautner
33877e15b8 Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev 2012-10-07 11:48:50 -07:00
Craig Mautner
5962b12bed Adds showWhenLocked attribute to Activities. 
The new attribute allows an Activity such as the alarm to appear
on all users screens.

Bug: 7213805 fixed.
Change-Id: If7866b13d88c04af07debc69e0e875d0adc6050a
 2012-10-06 13:09:58 -07:00
Jeff Sharkey
20c634c39a am 8052e88e: am b06ccdfb: Merge "Ellipsize long avatar names in user switcher." into jb-mr1-dev 
* commit '8052e88e1bcfe540a4d9c8a75ed1fa682c152395':
  Ellipsize long avatar names in user switcher.
 2012-10-05 16:14:25 -07:00
Jeff Sharkey
7b83158d8e Ellipsize long avatar names in user switcher. 
Bug: 7294380
Change-Id: Id82354172ee9be6b76ca98863e058ab0a58ecb78
 2012-10-05 15:50:28 -07:00
Baligh Uddin
72d2853b93 Import translations. DO NOT MERGE 
Change-Id: Idd0cea4e5c5c1dca92c18ef9caf58d21b83d31e7
Auto-generated-cl: translation import
 2012-10-05 14:21:37 -07:00
Philip Milne
e0ca5807da am 22238285: am 04b09636: Merge "Fix for bug: 7281620. Blank line after date in status widget disappears." into jb-mr1-dev 
* commit '222382855d0a15e35c0da785092d2d2a8043c3b4':
  Fix for bug: 7281620. Blank line after date in status widget disappears.
 2012-10-05 10:47:43 -07:00
Philip Milne
04b0963669 Merge "Fix for bug: 7281620. Blank line after date in status widget disappears." into jb-mr1-dev 2012-10-05 10:42:46 -07:00
Philip Milne
0223ffaa04 Fix for bug: 7281620. Blank line after date in status widget disappears. 
Change-Id: I9e8e31e14e17643551c3bf89bac898d91c3d37ca
 2012-10-05 10:27:42 -07:00
Jeff Hamilton
69813a0db1 am 7fe70683: am 20de160c: Revert "Changes to support updating location providers." 
* commit '7fe7068362e4e383390c039488dab65caa51df3b':
  Revert "Changes to support updating location providers."
 2012-10-05 00:52:44 -07:00
Jeff Hamilton
20de160ca3 Revert "Changes to support updating location providers." 
This reverts commit c19efc204aee1f0f3164dc21bd2ef3fdd4259c71.
 2012-10-05 02:32:52 -05:00
Matthew Xie
0c5785465c am 91d1d156: am d21b4839: Merge "Add multi user support for bluetooth" into jb-mr1-dev 
* commit '91d1d15624d831eb822ac97dde1916762e136015':
  Add multi user support for bluetooth
 2012-10-04 23:27:17 -07:00
Matthew Xie
d21b483904 Merge "Add multi user support for bluetooth" into jb-mr1-dev 2012-10-04 23:21:34 -07:00
Baligh Uddin
9565ceb609 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 21:43:10 -07:00
Matthew Xie
fca9d63635 Add multi user support for bluetooth 
Create a BLUETOOTH_STACK permission to share between all users of
Bluetooth apk. Bluetooth Manager binds to apk of current user
bug 6925422

Change-Id: I2df5546e977c2d77bc66d97d12479d933826922a
 2012-10-04 18:35:42 -07:00
Jeff Hamilton
35512ab006 am f2e292f5: am 82b94649: Merge "Changes to support updating location providers." into jb-mr1-dev 
* commit 'f2e292f5548fe791e5b5c882e5e2088e7417e8dc':
  Changes to support updating location providers.
 2012-10-04 18:29:51 -07:00
Jeff Hamilton
82b946496e Merge "Changes to support updating location providers." into jb-mr1-dev 2012-10-04 18:23:45 -07:00