summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Change title to "Select Wi-Fi"Russell Brenner2012-05-101-2/+2
| | | | | Bug: 6471984 Change-Id: I91f9d49e61a4a6e0ee177a7a6304613324357426
* Merge "Change title to "Wi-Fi network"" into jb-devRussell Brenner2012-05-091-1/+1
|\
| * Change title to "Wi-Fi network"Russell Brenner2012-05-091-1/+1
| | | | | | | | | | Bug: 6471984 Change-Id: I1b4a1b838f1751bf128978a17e1e01618cd3a26d
* | Merge "Apps tabs align to title on 2-pane settings." into jb-devAmith Yamasani2012-05-095-37/+21
|\ \ | |/ |/|
| * Apps tabs align to title on 2-pane settings.Amith Yamasani2012-05-095-37/+21
| | | | | | | | | | | | | | | | | | Pad the lists in Apps screen. Pad the color bar to align with the list. Bug: 6449489 Change-Id: I28c39e2aae04a1fe36c6b7dc447ae19da575edaf
* | Merge "Introduce new "vibrate when ringing"" into jb-devDaisuke Miyakawa2012-05-092-0/+8
|\ \
| * | Introduce new "vibrate when ringing"Daisuke Miyakawa2012-05-082-0/+8
| |/ | | | | | | | | | | | | | | | | | | | | | | | | We once removed "vibrate and ring" option with I7168ed140266a7c754fb3d7209cf12e73041c306, while we still need vibration setting which only affects Phone app. This depends on I850d27629a75615647883fdaa2933f337c4824d1 See also I3a4ed2bd5e4bde05dfb97c7bb20b9284d1c6f13f for Phone app side change. Bug: 6036529 Change-Id: Idb0453e187f8025565d6744cd774613531e7cb8b
* | Pass the shortcut to the user dictionary provider.Jean Chalard2012-05-091-2/+2
| | | | | | | | | | | | Bug: 6026080 Change-Id: I87b7c8b1ae89856f393871e6d3440b43efc22a29
* | Rework the list interfaceJean Chalard2012-05-091-32/+34
| | | | | | | | | | | | | | Display the shortcut in the list, and remove the cross button. Bug: 6026080 Change-Id: I7f594f07a84e4df3ad5b8160129d92d1a4b0fc28
* | Remove the useless parts in the 'add word' dialog.Jean Chalard2012-05-091-77/+12
| | | | | | | | | | Bug: 6026080 Change-Id: Ic2bf6dcfc2abfe5fc07759530042299cc6a0b503
* | Merge "Settings to control traces." into jb-devDianne Hackborn2012-05-082-44/+77
|\ \
| * | Settings to control traces.Dianne Hackborn2012-05-082-44/+77
| |/ | | | | | | | | | | | | | | | | Also some re-organization of the debug options, and check for the case where the global debug setting is turned off but there are some debug options turned on (in which case we just switch to the global option being on). Change-Id: I710e3a009e2be9c7c1a1879a853ac736abf1d8d8
* | Revert "Make verifier device id information visible"Kenny Root2012-05-082-14/+0
|/ | | | | | | | | | | | This reverts commit 498fbe470e8201ed6d4a1677025b274d9ca65e0b. Conflicts: res/xml/development_prefs.xml src/com/android/settings/DevelopmentSettings.java Bug: 6438155 Change-Id: I3ab866d0a269e355388bb3ef41737a7d097df8f6
* Implement the "add word" screen according to new specJean Chalard2012-05-082-0/+76
| | | | | | | | This is only the interface. It doesn't do anything yet, so as to avoid a too large change. Bug: 6026080 Change-Id: I0c7f0c09f71e01b18fcb3566a3c6c4b0f0b2a0fc
* Import translations. DO NOT MERGEEric Fischer2012-05-0749-103/+143
| | | | Change-Id: I5755d0e1a36dab74c96e27361421b0be4dc4d8b9
* Merge "Center clock on phones" into jb-devVikram Aggarwal2012-05-041-1/+0
|\
| * Center clock on phonesVikram Aggarwal2012-05-041-1/+0
| | | | | | | | | | | | Fix b/5579000 Change-Id: I80431999939fbecdf693649d58ad2031c03208b0
* | Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-05-0421-84/+48
|\ \
| * | Import translations. DO NOT MERGEEric Fischer2012-05-0421-84/+48
| |/ | | | | | | Change-Id: Ia8f1965490d5e34f0354724471feb2da0ee3b310
* | Merge "Avoid animation flashing and fix padding." into jb-devJeff Sharkey2012-05-044-14/+16
|\ \
| * | Avoid animation flashing and fix padding.Jeff Sharkey2012-05-044-14/+16
| | | | | | | | | | | | | | | Bug: 6446203 Change-Id: Icea64d5d30d894a6438af9278bc2d10b8b921d29
* | | Merge "Better messaging when Wi-Fi disabled." into jb-devJeff Sharkey2012-05-042-1/+11
|\ \ \ | |_|/ |/| |
| * | Better messaging when Wi-Fi disabled.Jeff Sharkey2012-05-042-1/+11
| |/ | | | | | | | | Bug: 6443166 Change-Id: I262e559e5c209d3f1959d5d2ab9a2aebb8180c59
* | Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-05-0314-65/+43
|\ \ | |/ |/|
| * Import translations. DO NOT MERGEEric Fischer2012-05-0314-65/+43
| | | | | | | | Change-Id: Ifb5adb2d887e6264aca0e664a119e9421739b2e5
* | UI fixes for tabletsVikram Aggarwal2012-05-032-3/+7
|/ | | | | | | | | 1. Center the clock on Xoom and large tablets. Fix b/5579000 2. Correctly remove the emergency call button if the device (*cough* Nakasi *cough*) does not have telephone capability. Change-Id: Ib7552dc35392a1b9d6c0381c6167949e2b163ddc
* Merge "Include the clock in landscape on Xoom" into jb-devVikram Aggarwal2012-05-023-36/+6
|\
| * Include the clock in landscape on XoomVikram Aggarwal2012-05-023-36/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. R.id.status was defined twice and was used inconsistently in code: (visibility set to enabled, but only on portrait...) This code removes the bad view. 2. The TextView date was never used, either by another layout or by code. Deleting this view too. 3. Including a standard status layout on smallest-width-600px, which includes a clock and a status message on Xoom. Fix b/6061076 Change-Id: Ibb492e89f6a4a38ac6a22398ec9c14bbe3fb7e3d
* | Import translations. DO NOT MERGEEric Fischer2012-05-0249-466/+438
|/ | | | Change-Id: Ie7a0ad55aa358abded6d5fe7d9d75b34dfc1c450
* Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-05-0117-152/+81
|\
| * Import translations. DO NOT MERGEEric Fischer2012-05-0117-152/+81
| | | | | | | | Change-Id: Ie838fa4a75d736bb941cf0a626f0d1d017562dfa
* | Do not reuse master_clear_gesture_* strings for credential installation ↵Brian Carlstrom2012-05-011-1/+6
|/ | | | | | | confirmation Bug: http://code.google.com/p/android/issues/detail?id=29367 Change-Id: I3b651bc84f22b48d651802115600ab4e256bb3a6
* Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-04-3049-182/+781
|\
| * Import translations. DO NOT MERGEEric Fischer2012-04-3049-182/+781
| | | | | | | | Change-Id: I8ea710c8a4a09a1e8a144d9b713e1fe9738c987d
* | Merge "Move tether settings help to menu and remove local assets." into jb-devAmith Yamasani2012-04-302-5/+2
|\ \ | |/ |/|
| * Move tether settings help to menu and remove local assets.Amith Yamasani2012-04-272-5/+2
| | | | | | | | | | | | | | | | Bug: 5270092 Using web help instead of local assets. Change-Id: Ib93e72443b30367521febc43279422ec130efbd5
* | Merge "Fix WPS string" into jb-devIrfan Sheriff2012-04-281-1/+1
|\ \
| * | Fix WPS stringIrfan Sheriff2012-04-271-1/+1
| |/ | | | | | | Change-Id: I5d45863c868c627fc48eefe1e15cb737b694d8ac
* | Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-04-2739-469/+240
|\ \
| * | Import translations. DO NOT MERGEEric Fischer2012-04-2739-469/+240
| | | | | | | | | | | | Change-Id: I4917f245f548a61165e7e36367d99871d6474408
* | | Merge "Fix 6291333: Don't show multiple pin/pattern/password confirmations" ↵Jim Miller2012-04-271-1/+2
|\ \ \ | | | | | | | | | | | | into jb-dev
| * | | Fix 6291333: Don't show multiple pin/pattern/password confirmationsJim Miller2012-04-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where orientation changes caused the system to ask for the pin/pattern/password multiple times. It also fixes a minor issue where we were showing buttons on the pattern confirmation screen (bug 6218057) Change-Id: I0894f37bb697baa4cc17917aaeb466440279b092
* | | | Merge "Add three new developer settings" into jb-devRomain Guy2012-04-272-0/+30
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add three new developer settingsRomain Guy2012-04-272-0/+30
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | - Show hw screen updates: show where apps udpate the screen when running with hw acceleration - Profile hw rendering: add extra profiling info to dumpsys gfxinfo for performance tracking - Debug layout: show layout info on screen Change-Id: I6f7cad762d65ec3be2debfb4a88c25d35bf11079
* | | Merge "Allow p2p device rename" into jb-devIrfan Sheriff2012-04-271-3/+5
|\ \ \ | |_|/ |/| |
| * | Allow p2p device renameIrfan Sheriff2012-04-261-3/+5
| |/ | | | | | | Change-Id: Ib61425da344f955b0a583716516181bdfbd4b504
* | Import translations. DO NOT MERGEEric Fischer2012-04-2649-689/+968
| | | | | | | | Change-Id: I35b0b64b3819b917c8dc312c93bacb89bf4a7d1e
* | Restore look of Wi-Fi panel for Setup WizardRussell Brenner2012-04-251-0/+2
|/ | | | | | | | | As part of the Wi-Fi refresh, this CL hides the action bar, menu, and Settings icon in the context of the Setup Wizard. Dead code related to WifiSettingsForSetupWizardXL has also been removed. Bug: 5364589 Change-Id: Ib6716500153879b939a18a7007f1f6521b73890b
* New API to allow third-party apps to bind widgetsMichael Jurka2012-04-243-1/+19
| | | | Change-Id: Ieec9f247fdbfc02c2ad8f5bb7f6b9efe0669af84
* Import translations. DO NOT MERGEEric Fischer2012-04-2449-227/+207
| | | | Change-Id: Iaccf544def97f82cc295a845a90961dae92c1116
generated by cgit v1.1 at 2025-02-10 13:13:38 +0000