summaryrefslogtreecommitdiffstats
path: root/core/res
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix missing layout parameters in keyguard." into jb-mr1-devJim Miller2012-10-167-3/+11
|\
| * Fix missing layout parameters in keyguard.Jim Miller2012-10-167-3/+11
| | | | | | | | | | | | | | This addresses crashes caused by an upcoming change to crash when missing layout_width and layout_height attributes are missing. Change-Id: I71044b4623d04cab41f4aee6a7a5c01b67b0d2a5
* | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-1616-34/+18
|\ \ | |/ |/|
| * Import translations. DO NOT MERGEBaligh Uddin2012-10-1216-34/+18
| | | | | | | | | | Change-Id: Ie7741746c85ad546258953e5e7cf8d2acd899c27 Auto-generated-cl: translation import
* | Add missing layout_width/heightRomain Guy2012-10-153-0/+20
| | | | | | | | | | | | Bug #7334849 Change-Id: Ie4bbe5905bec1d410b8b51e0194bb1c8c2b84680
* | Minor layout tweaks and bug fix in keyguardJim Miller2012-10-151-6/+14
| | | | | | | | | | | | | | | | | | - fix wrong string in SIM PUK unlock - use buttonBar style for "emergency" and "forgot pattern" buttons Bug 7341237 Change-Id: Id5593b54c345e3f869b6febc8554da01e7cb319e
* | Fixing issues with pattern recovery / account view (issue 7341237):Adam Cohen2012-10-1410-23/+82
| | | | | | | | | | | | | | | | | | -> Recovery button should only appear if account present -> Recovery button should appear at bottom -> Account view should have emergency call button -> Account view should not show the clock / status area Change-Id: Id12e8219f3fc6ecb14e82c5ec6ea4b3e28ed772d
* | Fix keyguard dimensions; IME state for password view; layoutsAdam Powell2012-10-139-40/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug where ordering during inflation caused us not to set a keyguard callback early enough to properly modify window flags. Add a gross hack to work around this for now. Fix status layouts to scale a bit more gracefully in the presence of an IME. Fix password layouts to scale more gracefully in the presence of an IME Bug 7343312 Bug 7341795 Bug 7342963 Bug 7343089 Change-Id: Ifb2c06defef11e8f7f9d0e09855632ed491bb31c
* | Fix offsets for glowpad on keyguardAdam Powell2012-10-122-1/+27
| | | | | | | | | | | | Bug 7342491 Change-Id: Id9733070c28a85c47ac8b982768e47a4254bd825
* | Align carrier info for glowpad keyguard screenAdam Powell2012-10-122-5/+3
| | | | | | | | | | | | Bug 7317728 Change-Id: I0788c6555e2443026d0533e14b544a5daf810937
* | Merge "Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware" into jb-mr1-devFabrice Di Meglio2012-10-121-0/+6
|\ \
| * | Fix bug #7325609 FragmentBreadCrumbs should be RTL-awareFabrice Di Meglio2012-10-111-0/+6
| | | | | | | | | | | | | | | | | | | | | - add horizontal gravity support - use gravity for doing layout depending on layout direction Change-Id: I562e824d15da9b00e1392f125b293aee21f8ee16
* | | Merge "Change keyguard to use single-stage unlock." into jb-mr1-devMike Cleron2012-10-1227-330/+709
|\ \ \ | |_|/ |/| |
| * | Change keyguard to use single-stage unlock.Jim Miller2012-10-1227-330/+709
| | | | | | | | | | | | Change-Id: Ica175a90ef4400941c7c4f05a494003b85d5e88c
* | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-1249-49/+97
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2012-10-1149-49/+97
| |/ / | | | | | | | | | | | | Change-Id: I4ef6935d25a8428069225adb3648701e93fd9c17 Auto-generated-cl: translation import
* | | DOCUMENTATION ONLY: try to clarify gravity vs layout_gravityChristopher Tate2012-10-111-4/+4
|/ / | | | | | | | | | | | | Based on 3rd party developer observation, this is a source of much confusion and layout mistakes. Change-Id: I2cb6ae1540fe2444582403d9100478ebe02df985
* | Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" ↵Danielle Millett2012-10-112-2/+4
|\ \ | | | | | | | | | into jb-mr1-dev
| * | Face Unlock is shown correctly during a phone call - fix b/7271718Danielle Millett2012-10-092-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Final keyguard tablet layout integration" into jb-mr1-devAdam Cohen2012-10-1121-103/+360
|\ \ \
| * | | Final keyguard tablet layout integrationJim Miller2012-10-1021-103/+360
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-1049-67/+67
|\ \ \ \ | |_|_|/ |/| | |
| * | | Import translations. DO NOT MERGEBaligh Uddin2012-10-1049-67/+67
| |/ / | | | | | | | | | | | | Change-Id: I57efb052a4003b16c6901ea8af12efcd535d1e4c Auto-generated-cl: translation import
* | | Update to accessibility toggle message.Casey Burkhardt2012-10-101-1/+1
|/ / | | | | | | Change-Id: I9957b86f3424d800b1b9804dc77f5bc5b728922b
* | Merge "Revert "Revert "Add config resource to help ATT prepaid""" into ↵Baligh Uddin2012-10-092-0/+6
|\ \ | | | | | | | | | jb-mr1-dev
| * | Revert "Revert "Add config resource to help ATT prepaid""Baligh Uddin2012-10-092-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Revert the revert - change is good. This reverts commit 2133caf515660d957bb7fd05b35e7eb2f2391d48 Change-Id: I987d5533e8ce909a3adfa38bceeac5c42e22da19
* | | Merge "Revert "Add config resource to help ATT prepaid"" into jb-mr1-devBaligh Uddin2012-10-092-6/+0
|\ \ \ | |/ /
| * | Revert "Add config resource to help ATT prepaid"Baligh Uddin2012-10-092-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | breaking jb-mr1-release This reverts commit 901ac560cafe0b8d76fd7441cbaf8749be33577c Change-Id: I5fab4097a40e0ba31dc716967ef921c113a795a7
* | | Merge "Add config resource to help ATT prepaid" into jb-mr1-devRobert Greenwalt2012-10-092-0/+6
|\ \ \ | |/ /
| * | Add config resource to help ATT prepaidRobert Greenwalt2012-10-092-0/+6
| | | | | | | | | | | | | | | bug:7306353 Change-Id: I8da9e7591ad5e28d5b319df11435333da44fb7d3
* | | Merge "Allow more scaling values to be tuned in resource overlays" into ↵Adam Powell2012-10-092-0/+5
|\ \ \ | |/ / |/| | | | | jb-mr1-dev
| * | Allow more scaling values to be tuned in resource overlaysAdam Powell2012-10-092-0/+5
| |/ | | | | | | | | | | Bug 7267507 Change-Id: I3fba6882a0ac4cb7d34430ba36dec83c030a73cd
* | Merge "enforce camera sound according to country code" into jb-mr1-devEric Laurent2012-10-093-0/+29
|\ \ | |/ |/|
| * enforce camera sound according to country codeEric Laurent2012-10-083-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Fix "checking account" string" into jb-mr1-devJim Miller2012-10-081-1/+1
|\ \
| * | Fix "checking account" stringJim Miller2012-10-081-1/+1
| | | | | | | | | | | | | | | | | | Fixes bug 7309934 Change-Id: Ia665142b8dcd8de424312bd7bf0800d7b871b03b
* | | Merge "Framework side of issue #7302511: GCM client needs to use new ↵Dianne Hackborn2012-10-082-0/+4
|\ \ \ | | | | | | | | | | | | framework API..." into jb-mr1-dev
| * | | Framework side of issue #7302511: GCM client needs to use new framework API...Dianne Hackborn2012-10-082-0/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...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
* | | Import translations. DO NOT MERGEBaligh Uddin2012-10-0815-34/+34
|/ / | | | | | | | | Change-Id: I8dd8dacad06a9f7be27ac666f7fc4a51308347aa Auto-generated-cl: translation import
* | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-085-148/+74
|\ \ | |/ |/|
| * Import translations. DO NOT MERGEBaligh Uddin2012-10-055-148/+74
| | | | | | | | | | Change-Id: Idd0cea4e5c5c1dca92c18ef9caf58d21b83d31e7 Auto-generated-cl: translation import
* | Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-devCraig Mautner2012-10-072-5/+12
|\ \
| * | Adds showWhenLocked attribute to Activities.Craig Mautner2012-10-062-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | The new attribute allows an Activity such as the alarm to appear on all users screens. Bug: 7213805 fixed. Change-Id: If7866b13d88c04af07debc69e0e875d0adc6050a
* | | Ellipsize long avatar names in user switcher.Jeff Sharkey2012-10-051-0/+2
| |/ |/| | | | | | | Bug: 7294380 Change-Id: Id82354172ee9be6b76ca98863e058ab0a58ecb78
* | Merge "Fix for bug: 7281620. Blank line after date in status widget ↵Philip Milne2012-10-051-1/+2
|\ \ | | | | | | | | | disappears." into jb-mr1-dev
| * | Fix for bug: 7281620. Blank line after date in status widget disappears.Philip Milne2012-10-051-1/+2
| |/ | | | | | | Change-Id: I9e8e31e14e17643551c3bf89bac898d91c3d37ca
* | Revert "Changes to support updating location providers."Jeff Hamilton2012-10-052-1/+9
| | | | | | | | This reverts commit c19efc204aee1f0f3164dc21bd2ef3fdd4259c71.
* | Merge "Add multi user support for bluetooth" into jb-mr1-devMatthew Xie2012-10-041-0/+7
|\ \
| * | Add multi user support for bluetoothMatthew Xie2012-10-041-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-0437-831/+420
|\ \ \