summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Update verify apps summary stringrich cannings2014-02-181-1/+1
| | | | | Bug: 12836511 Change-Id: I7c198efc03b403f2dfede47648487875bc9b2f82
* Update verify apps summary stringrich cannings2014-02-181-1/+1
| | | | | Bug: 12836511 Change-Id: Ibce824bcef3e3c9a3f9ea69ed4b8425663bbdb12
* Merge "Improve titles"Fabrice Di Meglio2014-02-186-6/+6
|\
| * Improve titlesFabrice Di Meglio2014-02-136-6/+6
| | | | | | | | | | | | | | - makes titles consistent with what is shown into the Drawer and defined into the PreferenceScreen files Change-Id: I6077d947b3afcc63bfbe9c78b973709778064f9b
* | Import translations. DO NOT MERGEBaligh Uddin2014-02-173-5/+5
| | | | | | | | | | Change-Id: Ifc5a92d261269d729bb216c2acda566ba8091eec Auto-generated-cl: translation import
* | Merge "Support default, pattern, pin and password encryption types"Paul Lawrence2014-02-144-0/+180
|\ \
| * | Support default, pattern, pin and password encryption typesPaul Lawrence2014-02-114-0/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use plumbing provided by dependant change to bring up correct dialog at boot time. Needs matching framework changes from https://googleplex-android-review.googlesource.com/#/c/412885/ Bug: 8769627 Change-Id: Ib04a2875e051a7cccca035fadb25978dfec22491
* | | Import translations. DO NOT MERGEBaligh Uddin2014-02-123-4/+4
| |/ |/| | | | | | | Change-Id: I42687df26965ff4f23fc5ed2db2e93d300aba609 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2014-02-1068-101/+27
|/ | | | | Change-Id: I42c05c7a36d32e5f8dc365b67f84591419ec958a Auto-generated-cl: translation import
* Fix bug #12919330 RTE in Settings: PhoneFactory probably already runningFabrice Di Meglio2014-02-062-4/+8
| | | | | | | - revert changes from the CL for Drawer implementation. - we cannot convert those Activities to fragments as they are running in the Phone process Change-Id: I7e4033bc9b53daa7e7aa6f1fd74576375cde88e9
* Merge "Remove overdraw count option"John Reck2014-02-061-2/+0
|\
| * Remove overdraw count optionJohn Reck2014-02-051-2/+0
| | | | | | | | Change-Id: Ia9f794d5817b7dd7a193864575d120d004cb552e
* | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-02-0556-2/+191
|\ \
| * | Import translations. DO NOT MERGEGeoff Mendal2014-02-0556-2/+191
| | | | | | | | | | | | | | | Change-Id: Ie839360615ba80cba4a1aee00f74e50d5c4c387f Auto-generated-cl: translation import
* | | Fix Overview position in DrawerFabrice Di Meglio2014-02-051-4/+4
|/ / | | | | | | | | | | - makes "Overview" the first entry in the Drawer (it was still under Wireless and Networks) Change-Id: Iae425b885ea7b8ee611871a1739117341d1c94c1
* | Fix bug #12893337 Crash while set up SIM card lockFabrice Di Meglio2014-02-041-4/+2
| | | | | | | | | | | | | | - remove Intent declaration in favor of a Fragment - make PhoneFactory.getDefaultPhone() call work again Change-Id: Ie1cb6894b0c00361c451af1f8542c905213a3c97
* | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-02-043-17/+17
|\ \
| * | Import translations. DO NOT MERGEGeoff Mendal2014-02-033-17/+17
| |/ | | | | | | | | Change-Id: Ic0d6d1818b69a76e523b68dede2b6256b0f16e12 Auto-generated-cl: translation import
* | Use Drawer in Settings appFabrice Di Meglio2014-02-0312-4/+170
|/ | | | | | | | | | | | | | | | | | | | - get rid of PreferenceActivity as much as we can and use fragments instead - add Drawer widget - add Dashboard high level entry into the Drawer (but this is work in progress and would be done in another CL) - add bypass of fragment's Header validation when launched from the Drawer but *force* validation if external call thru an Intent Be aware that WifiPickerActivity should remain for now a PreferenceActivity. It is used by SetupWizard and should not trigger running the SettingsActivity's header building code. SetupWizard is a Home during the provisionnig process and then deactivate itself as a Home but would make the Home header to appear in the Drawer (because momentarily we would have two Home). Also, verified that: - the WiFi settings still work when called from SetupWizard - when you have multiple Launchers, the Home header will appear in the list of Headers in the Drawer Change-Id: I407a5e0fdd843ad7615d3d511c416a44e3d97c90
* Import translations. DO NOT MERGEBaligh Uddin2014-01-271-2/+2
| | | | | Change-Id: I675d41b04b76436681f56c81ffa8986dfda5dfaf Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2014-01-2360-546/+1774
| | | | | Change-Id: Id0ec338a7ae2f850b102eff2f2a5f8df5cc0e493 Auto-generated-cl: translation import
* Merge "Fix misspell of "otherdevices""Wei Wang2014-01-161-1/+1
|\
| * Fix misspell of "otherdevices"Wei Wang2014-01-161-1/+1
| | | | | | | | | | | | Bug: 12569650 Change-Id: I2c75ddfed22ded6a15291956c0c167acf6d67b0b
* | Import translations. DO NOT MERGEGeoff Mendal2014-01-1559-1981/+1266
|/ | | | | Change-Id: I7aa8da8f75c22a70283b7125d993c3e38164cf4e Auto-generated-cl: translation import
* Merge commit 'f4f8d9f3' into manualmergeWei Wang2014-01-141-7/+0
|\ | | | | | | | | | | | | Conflicts: res/values/strings.xml Change-Id: Ifbcd6ef2447dbb95aab0ed1971f63a16ecf8035c
| * BLE peripheral mode (4/4): Settings change for advertising preference.Wei Wang2014-01-143-15/+94
| | | | | | | | Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
* | Merge commit 'fc8d2556' into manualmergeWei Wang2014-01-141-0/+7
|\ \ | |/ | | | | | | | | | | Conflicts: res/values/strings.xml Change-Id: Ia2a4480d13f5afae7ecef321dadf5c4686907d99
| * Add ble settings strings.Wei Wang2014-01-141-0/+9
| | | | | | | | Change-Id: If8685aac2f36f56a534f3ba47b1cc60fed88a8a3
* | Merge "BLE peripheral mode (4/4): Settings change for advertising preference."Wei Wang2014-01-153-15/+94
|\ \
| * | BLE peripheral mode (4/4): Settings change for advertising preference.Wei Wang2014-01-133-15/+94
| | | | | | | | | | | | Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
* | | Merge "Add "unaccounted" item to battery use UI."Dianne Hackborn2014-01-141-0/+19
|\ \ \
| * | | Add "unaccounted" item to battery use UI.Dianne Hackborn2014-01-131-0/+19
| |/ / | | | | | | | | | | | | | | | Kind-of informative. Change-Id: I10d2ee1ad8fe598a1ce1989df6628da11b82d906
* | | Import translations. DO NOT MERGEGeoff Mendal2014-01-134-17/+17
|/ / | | | | | | | | Change-Id: I0637da71be16cac3c7f383840b4ad293e13dcf0e Auto-generated-cl: translation import
* | Merge "Remove outdated custom background for password field."Jorim Jaggi2014-01-1011-34/+0
|\ \
| * | Remove outdated custom background for password field.Jorim Jaggi2014-01-0811-34/+0
| | | | | | | | | | | | | | | | | | | | | In the lockscreen settings, the entry text field for the PIN/password still uses an outdated, gingerbready background. This is removed by using the default Holo background. Bug: 12382439 Change-Id: Iaa7ea4980060762841646a4b8ea18d008518c24b
* | | Import translations. DO NOT MERGEBaligh Uddin2014-01-087-11/+11
|/ / | | | | | | | | Change-Id: Id94be623bf3a47fab9034a791a32804c6f4d65fa Auto-generated-cl: translation import
* | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-01-074-17/+27
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2014-01-064-17/+27
| | | | | | | | | | | | | | | Change-Id: I8014cf9cada2cd71bcd00121975f25fa4426e372 Auto-generated-cl: translation import
* | | Merge "Remove rotation-lock from Display settings."John Spurlock2014-01-061-4/+0
|\ \ \ | |/ / |/| |
| * | Remove rotation-lock from Display settings.John Spurlock2013-12-191-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Ability to lock device to natural orientation is still available under Accessibility. Bug:11062710 Change-Id: I2045e16cfc676ee75d4d42b0cd652433b2f12715
* | | Import translations. DO NOT MERGEBaligh Uddin2014-01-022-11/+11
| | | | | | | | | | | | | | | Change-Id: Iac0ca68f26633df3b392e7c2559767485b1571d6 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2013-12-303-5/+5
| | | | | | | | | | | | | | | Change-Id: I0f3e103c568ec7c7ddee3695e73a7a9f47465730 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2013-12-26112-262/+646
| | | | | | | | | | | | | | | Change-Id: I295b494750d386344faed16eb3f281dfac28bea2 Auto-generated-cl: translation import
* | | Merge "Additional captioning fonts"Alan Viverette2013-12-201-0/+6
|\ \ \
| * | | Additional captioning fontsAlan Viverette2013-12-191-0/+6
| |/ / | | | | | | | | | Change-Id: Ib3298f65b602d581fa031576c3b9026bfd6a8672
* | | Merge "Additional caption settings for edge styles and window color"Alan Viverette2013-12-204-6/+29
|\ \ \
| * | | Additional caption settings for edge styles and window colorAlan Viverette2013-12-194-6/+29
| |/ / | | | | | | | | | Change-Id: Ib967bc566a7b8f7674c696fc05d799e12269ec42
* | | Merge "Update to follow BatteryStats."Dianne Hackborn2013-12-191-4/+4
|\ \ \
| * | | Update to follow BatteryStats.Dianne Hackborn2013-12-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change data use to be based on packets instead of bytes. Change-Id: I536dd2c2fc3fbeb12689e793f79e5fac984fe3af
* | | | Import translations. DO NOT MERGEBaligh Uddin2013-12-1813-27/+27
| |/ / |/| | | | | | | | | | | Change-Id: Ie72bd5a59406450877a580e2c60c0c81f48ef603 Auto-generated-cl: translation import