summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Fix 6663465: remove flagNoEnterAction in favor of actionNextJim Miller2012-06-158-4/+8
| | | | | | | | | This fixes a bug where the return key was showing in some layouts for choose/confirm password screens in Settings. Now we just use "actionNext" which ensures we see consistent behavior across devices. Change-Id: I4bf3033654b85f14c55de6f418caaf1ce563c33a
* Import translations. DO NOT MERGEEric Fischer2012-06-148-26/+17
| | | | Change-Id: Ife956408e146ad876b860968dacd8f3095ed84e1
* Import translations. DO NOT MERGEEric Fischer2012-06-1349-91/+335
| | | | Change-Id: I8566dbced26846ce55861b5f57f95034d03604c2
* Storage banner when device in low disk state.Jeff Sharkey2012-06-121-1/+6
| | | | | Bug: 6576409 Change-Id: I25f71935e312bf6efa832d10c22e3edbdc18f4fb
* Import translations. DO NOT MERGEYing Wang2012-06-1239-333/+201
| | | | Change-Id: I3f7c3cd191375024cd5613b3d2b8e0c859c96928
* Import translations. DO NOT MERGEEric Fischer2012-06-1127-479/+249
| | | | Change-Id: I835b15b3d3081d5d9010ff91eb54b9cd6e6316bb
* Merge "Exit to Settings when removing the only account for a type." into jb-devAmith Yamasani2012-06-082-6/+75
|\
| * Exit to Settings when removing the only account for a type.Amith Yamasani2012-06-082-6/+75
| | | | | | | | | | | | | | | | | | | | | | Skip over the ManageAccounts screen which shows the list of accounts for a particular type, if there are no accounts there. Bug: 6630827 Also fix text alignment in top-level of settings. Change-Id: Icd446babc131e7052fc9e95514214fffe6e6e113
* | Import translations. DO NOT MERGEEric Fischer2012-06-0852-542/+277
| | | | | | | | Change-Id: I8964ab48dade7424b2957d1f7ec7f2d8b9fb0ae0
* | Add ID to copy translation from to string that is not translated yet.Eric Fischer2012-06-081-1/+1
| | | | | | | | Change-Id: If2fcdeb8ea6fb10a5abb04f3f5e654c03332bd2e
* | Merge "Removing head turn and putting blink back" into jb-devDanielle Millett2012-06-083-57/+6
|\ \ | |/ |/|
| * Removing head turn and putting blink backDanielle Millett2012-06-083-57/+6
| | | | | | | | | | | | | | | | Changing the strings and workflow in settings to be blink again instead of the new head turn. This basically undoes the following two cls: I67c8acd4 and Ifc7b6e18. Change-Id: I8694b1d82efac9d2f97c29128da6698b6ac2a4ce
* | Import translations. DO NOT MERGEEric Fischer2012-06-0751-99/+138
| | | | | | | | Change-Id: I5c5f75c4980677fef82c64d83f3d7a37ae604cc3
* | Merge "Add back a SYNC_SETTINGS screen" into jb-devAmith Yamasani2012-06-072-1/+22
|\ \
| * | Add back a SYNC_SETTINGS screenAmith Yamasani2012-06-062-1/+22
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revive the old Accounts&Sync screen as a dialog with the auto-sync checkbox and a list of accounts. This will be launched when Apps request a SYNC_SETTINGS page for controlling account and master sync. Auto-sync data checkbox will also continue to exist in Data Usage. Minor fixes to account list and account update monitoring. Bug: 6614013 Bug: 6622995 Bug: 6610247 Change-Id: I35c0919a29c6bc7e5edf64f2734a3ef4f5ae5e7a
* | Merge "Fix 6622557: Developer options "Show layout bounds" summary should ↵Philip Milne2012-06-061-1/+1
|\ \ | | | | | | | | | say "margins" instead of "padding"" into jb-dev
| * | Fix 6622557: Developer options "Show layout bounds" summary should say ↵Philip Milne2012-06-061-1/+1
| |/ | | | | | | | | | | "margins" instead of "padding" Change-Id: I702b0d86c33b49854df5a65b398891183c3212cf
* | Import translations. DO NOT MERGEEric Fischer2012-06-0650-255/+173
|/ | | | Change-Id: If466dfc20ff28bfb26b10214503200452c66ccea
* Merge "Revert "Rename and flip meaning of auto-rotate to rotation lock."" ↵Jeff Brown2012-06-051-2/+2
|\ | | | | | | into jb-dev
| * Revert "Rename and flip meaning of auto-rotate to rotation lock."Jeff Brown2012-06-051-2/+2
| | | | | | | | | | Bug: 6523269 This reverts commit b94417109279fb7d27f0b27c97e76860ed6446ba.
* | Increase dimens for power control widget for sw600dpAndrew Flynn2012-06-053-2/+6
| | | | | | | | | | Bug: 6527125 Change-Id: If4c3dad24e8fc70ca76bb551cfd9e32be96a6337
* | Import translations. DO NOT MERGEEric Fischer2012-06-0549-423/+1222
| | | | | | | | Change-Id: I81581e50f658f628a5d6354c9c8372cc1a98d566
* | Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-06-0449-502/+360
|\ \
| * | Import translations. DO NOT MERGEEric Fischer2012-06-0449-502/+360
| |/ | | | | | | Change-Id: I3347ec085b2a09f654b17c0609522d47a14627b2
* | Account types at toplevel of SettingsAmith Yamasani2012-06-047-17/+45
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | Reorganized Account settings to show account types at the top-level of Settings. Only account types that have accounts added are visible here. There is an Add account button to add a new account. Master sync toggle has moved to Data Usage screen in the overflow menu. It shows additional detail of the function of the auto-sync toggle when it is toggled by the user. Account type screen (ManageAccountsSettings) shows list of accounts of that type and any available authenticator settings. It additionally verifies any Intents can be resolved before showing the corresponding entry. This screen now shows last synced time for each account. You can now sync all accounts of a type by selecting Sync now in the Account type screen. Account Sync screen that shows the list of syncable items has minor tweaks: - "Last synced...", "Sync is OFF" - Doesn't show the authenticator settings here anymore. Bug: 6579937 Change-Id: I8139a4c992b525a3e1efc24d2d223c3f5caddc76
* Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-06-0149-1571/+995
|\
| * Import translations. DO NOT MERGEEric Fischer2012-06-0149-1571/+995
| | | | | | | | Change-Id: Id95cfc21f742d95cdb4b8ca7530c4410faaaba63
* | Merge "Bug 5457035: Changed strings in FUL anti-spoofing setup" into jb-devBrian Colonna2012-06-011-4/+3
|\ \ | |/ |/|
| * Bug 5457035: Changed strings in FUL anti-spoofing setupBrian Colonna2012-06-011-4/+3
| | | | | | | | | | | | | | Added latest string changes requested for Face Unlock liveness/head-turn anti-spoofing option. Change-Id: Ic703bda6b449756bdf05d7de843e9aab6b939446
* | Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-05-3149-408/+695
|\ \
| * | Import translations. DO NOT MERGEEric Fischer2012-05-3149-408/+695
| |/ | | | | | | Change-Id: I508ef274b0aa63d2505a2db40534697b6b266666
* | Merge "Reword the summary text for Unknown sources in Security Settings" ↵Amith Yamasani2012-05-311-1/+1
|\ \ | | | | | | | | | into jb-dev
| * | Reword the summary text for Unknown sources in Security SettingsAmith Yamasani2012-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | Don't use "non-Market" to describe unknown sources. Bug: 6586626 Change-Id: I2ab440e9db1592ea8b398bd9466ff2f05ca5f6ce
* | | Merge "Fix poor network detection setting" into jb-devIrfan Sheriff2012-05-312-7/+7
|\ \ \ | |_|/ |/| |
| * | Fix poor network detection settingIrfan Sheriff2012-05-312-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | We used to base this on watchdog being turned on, but it should be based on whether device is wifi only Bug: 6576101 Change-Id: Ib5221287e6713c625d39ef986ceb278825fb4895
* | | BUG 5457035 : Anti-spoofing : DO NOT MERGEUriel Rodriguez2012-05-303-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 060b9daf5fe3c45573a13a149bf98f4fa1e6a46f Author: Danielle Millett <dmillett@google.com> Date: Wed May 30 15:50:03 2012 -0400 Added head turn option for Face Unlock. In security settings there is an option for head turn and it shows the current status (on/off). Clicking on this goes to another screen that describes the feature and allows the user to it on/off. Since the head turn option goes to a different screen instead of using a check box, this change also rips out the rest of the code for the old liveliness checkbox. Change-Id: I197af51084f3e751081fa159dadd6c2c80840d1e Change-Id: I67c8acd49316b49771a0bb97b4a5fbd5a1c13262
* | | Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-05-3050-1001/+932
|\ \ \ | |_|/ |/| |
| * | Import translations. DO NOT MERGEEric Fischer2012-05-3050-1001/+932
| | | | | | | | | | | | Change-Id: I45c903dfad7e0b599f9b29b3c4f472d3daf9b25d
* | | Merge "Adjust layout to avoid clipping." into jb-devAmith Yamasani2012-05-303-5/+5
|\ \ \ | |/ / |/| |
| * | Adjust layout to avoid clipping.Amith Yamasani2012-05-293-5/+5
| |/ | | | | | | | | | | | | Fixes the WiFi AP dialogs getting clipped at the right edge. Bug: 6525128 Change-Id: Ic1c5c682d51e1492fe3c739c01255db886a90518
* | Merge "Make string bigger for localization." into jb-devJeff Brown2012-05-291-1/+1
|\ \
| * | Make string bigger for localization.Jeff Brown2012-05-291-1/+1
| | | | | | | | | | | | | | | Bug: 6575551 Change-Id: Ia13043325bc9fe28e36a0047dba5313900ab91d2
* | | Merge "Surface metered networks as "Mobile hotspots."" into jb-devJeff Sharkey2012-05-291-6/+6
|\ \ \
| * | | Surface metered networks as "Mobile hotspots."Jeff Sharkey2012-05-291-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | String changes to give clearer definition of metered networks, and remove metered control for mobile network. Also fix NPE when testing hasEthernet() before session is ready. Bug: 6494976 Change-Id: Ia55ca3362a05977b9f21ab41eb10bbc738e29620
* | | | Import translations. DO NOT MERGEEric Fischer2012-05-2917-382/+198
|/ / / | | | | | | | | | Change-Id: I46077aeea1d55b35eddd45138c09d25bf3df4aa6
* | | Import translations. DO NOT MERGEEric Fischer2012-05-2598-2819/+2948
| |/ |/| | | | | Change-Id: Ia98a540aa471fa330bfa066330d0e48e058f4798
* | Merge "String change." into jb-devJeff Brown2012-05-241-1/+1
|\ \ | |/
| * String change.Jeff Brown2012-05-241-1/+1
| | | | | | | | Change-Id: Ic2d52977682d1074ce37df219db4c0a199d50196
* | Merge "Updating launcher icon to fix alignment. Bug: 6511716" into jb-devChristian Robertson2012-05-236-0/+0
|\ \ | |/ |/|
| * Updating launcher icon to fix alignment. Bug: 6511716Christian Robertson2012-05-236-0/+0
| | | | | | | | Change-Id: I912c356fcd61414394ef9318568491b68a63b724