Commit Graph

4021 Commits

Author SHA1 Message Date
Fabrice Di Meglio
86a2556aa7 Merge "Improve titles" 2014-02-18 21:37:46 +00:00
Baligh Uddin
9342f0a7c6 Import translations. DO NOT MERGE
Change-Id: Ifc5a92d261269d729bb216c2acda566ba8091eec
Auto-generated-cl: translation import
2014-02-17 15:54:58 -08:00
Paul Lawrence
b643627651 Merge "Support default, pattern, pin and password encryption types" 2014-02-14 15:25:25 +00:00
Fabrice Di Meglio
c169ee6fdc Improve titles
- makes titles consistent with what is shown into the Drawer and
defined into the PreferenceScreen files

Change-Id: I6077d947b3afcc63bfbe9c78b973709778064f9b
2014-02-13 18:55:15 -08:00
Baligh Uddin
2b2b4960b8 Import translations. DO NOT MERGE
Change-Id: I42687df26965ff4f23fc5ed2db2e93d300aba609
Auto-generated-cl: translation import
2014-02-12 12:46:26 -08:00
Paul Lawrence
b05f39d186 Support default, pattern, pin and password encryption types
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
2014-02-11 10:27:58 -08:00
Baligh Uddin
780f729f71 Import translations. DO NOT MERGE
Change-Id: I42c05c7a36d32e5f8dc365b67f84591419ec958a
Auto-generated-cl: translation import
2014-02-10 15:09:57 -08:00
Fabrice Di Meglio
3065f75e16 Fix bug #12919330 RTE in Settings: PhoneFactory probably already running
- 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
2014-02-06 17:51:30 -08:00
John Reck
1b7bf5eaae Merge "Remove overdraw count option" 2014-02-06 18:49:09 +00:00
John Reck
a097c22662 Remove overdraw count option
Change-Id: Ia9f794d5817b7dd7a193864575d120d004cb552e
2014-02-05 16:48:21 -08:00
Geoff Mendal
44c62f4b04 Merge "Import translations. DO NOT MERGE" 2014-02-05 21:31:25 +00:00
Geoff Mendal
48cbcc3f6f Import translations. DO NOT MERGE
Change-Id: Ie839360615ba80cba4a1aee00f74e50d5c4c387f
Auto-generated-cl: translation import
2014-02-05 13:29:06 -08:00
Fabrice Di Meglio
c27b7d45e9 Fix Overview position in Drawer
- makes "Overview" the first entry in the Drawer (it was still under Wireless and Networks)

Change-Id: Iae425b885ea7b8ee611871a1739117341d1c94c1
2014-02-05 12:59:29 -08:00
Fabrice Di Meglio
74abdfd3e6 Fix bug #12893337 Crash while set up SIM card lock
- remove Intent declaration in favor of a Fragment
- make PhoneFactory.getDefaultPhone() call work again

Change-Id: Ie1cb6894b0c00361c451af1f8542c905213a3c97
2014-02-04 15:42:47 -08:00
Geoff Mendal
b75d7275c1 Merge "Import translations. DO NOT MERGE" 2014-02-04 02:33:26 +00:00
Fabrice Di Meglio
263bcc8b73 Use Drawer in Settings app
- 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
2014-02-03 16:36:46 -08:00
Geoff Mendal
0be91620ad Import translations. DO NOT MERGE
Change-Id: Ic0d6d1818b69a76e523b68dede2b6256b0f16e12
Auto-generated-cl: translation import
2014-02-03 15:31:45 -08:00
Baligh Uddin
a101937354 Import translations. DO NOT MERGE
Change-Id: I675d41b04b76436681f56c81ffa8986dfda5dfaf
Auto-generated-cl: translation import
2014-01-27 12:13:36 -08:00
Baligh Uddin
e22559c5f5 Import translations. DO NOT MERGE
Change-Id: Id0ec338a7ae2f850b102eff2f2a5f8df5cc0e493
Auto-generated-cl: translation import
2014-01-23 10:03:30 -08:00
Wei Wang
e179bb0133 Merge "Fix misspell of "otherdevices"" 2014-01-16 23:26:57 +00:00
Wei Wang
aa6e665a02 Fix misspell of "otherdevices"
Bug: 12569650

Change-Id: I2c75ddfed22ded6a15291956c0c167acf6d67b0b
2014-01-16 22:13:38 +00:00
Geoff Mendal
fda2b12fea Import translations. DO NOT MERGE
Change-Id: I7aa8da8f75c22a70283b7125d993c3e38164cf4e
Auto-generated-cl: translation import
2014-01-15 13:20:24 -08:00
Wei Wang
ab4029665b Merge commit 'f4f8d9f3' into manualmerge
Conflicts:
	res/values/strings.xml

Change-Id: Ifbcd6ef2447dbb95aab0ed1971f63a16ecf8035c
2014-01-14 23:42:41 -08:00
Wei Wang
eeb60f9473 Merge commit 'fc8d2556' into manualmerge
Conflicts:
	res/values/strings.xml

Change-Id: Ia2a4480d13f5afae7ecef321dadf5c4686907d99
2014-01-14 22:33:21 -08:00
Wei Wang
f4f8d9f346 BLE peripheral mode (4/4): Settings change for advertising preference.
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
2014-01-14 18:06:42 -08:00
Wei Wang
fc8d255671 Add ble settings strings.
Change-Id: If8685aac2f36f56a534f3ba47b1cc60fed88a8a3
2014-01-14 18:06:32 -08:00
Wei Wang
c0af0c4633 Merge "BLE peripheral mode (4/4): Settings change for advertising preference." 2014-01-15 01:43:37 +00:00
Dianne Hackborn
4792823f71 Merge "Add "unaccounted" item to battery use UI." 2014-01-14 01:52:12 +00:00
Wei Wang
eb56b9ccb8 BLE peripheral mode (4/4): Settings change for advertising preference.
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
2014-01-13 17:41:02 -08:00
Dianne Hackborn
5b6f59a072 Add "unaccounted" item to battery use UI.
Kind-of informative.

Change-Id: I10d2ee1ad8fe598a1ce1989df6628da11b82d906
2014-01-13 17:40:50 -08:00
Geoff Mendal
dde5db16b9 Import translations. DO NOT MERGE
Change-Id: I0637da71be16cac3c7f383840b4ad293e13dcf0e
Auto-generated-cl: translation import
2014-01-13 14:04:01 -08:00
Jorim Jaggi
5f37dda3d8 Merge "Remove outdated custom background for password field." 2014-01-10 02:15:15 +00:00
Jorim Jaggi
4378743a2f Remove outdated custom background for password field.
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
2014-01-08 15:03:25 -08:00
Baligh Uddin
6b67fe51dc Import translations. DO NOT MERGE
Change-Id: Id94be623bf3a47fab9034a791a32804c6f4d65fa
Auto-generated-cl: translation import
2014-01-08 11:18:23 -08:00
Baligh Uddin
6ec3de28b9 Merge "Import translations. DO NOT MERGE" 2014-01-07 05:00:49 +00:00
Baligh Uddin
aa4f947611 Import translations. DO NOT MERGE
Change-Id: I8014cf9cada2cd71bcd00121975f25fa4426e372
Auto-generated-cl: translation import
2014-01-06 18:49:53 -08:00
John Spurlock
3e9110fe6a Merge "Remove rotation-lock from Display settings." 2014-01-06 19:22:15 +00:00
Baligh Uddin
bf795e7ed5 Import translations. DO NOT MERGE
Change-Id: Iac0ca68f26633df3b392e7c2559767485b1571d6
Auto-generated-cl: translation import
2014-01-02 09:50:54 -08:00
Baligh Uddin
6006d2c2da Import translations. DO NOT MERGE
Change-Id: I0f3e103c568ec7c7ddee3695e73a7a9f47465730
Auto-generated-cl: translation import
2013-12-30 15:13:19 -08:00
Baligh Uddin
63974a92c8 Import translations. DO NOT MERGE
Change-Id: I295b494750d386344faed16eb3f281dfac28bea2
Auto-generated-cl: translation import
2013-12-26 16:30:07 -08:00
Alan Viverette
dd6513d969 Merge "Additional captioning fonts" 2013-12-20 00:41:02 +00:00
Alan Viverette
7f9781b559 Merge "Additional caption settings for edge styles and window color" 2013-12-20 00:40:53 +00:00
Dianne Hackborn
09a3c1f949 Merge "Update to follow BatteryStats." 2013-12-19 22:51:47 +00:00
John Spurlock
26c3b25ac3 Remove rotation-lock from Display settings.
Ability to lock device to natural orientation is still available
under Accessibility.

Bug:11062710
Change-Id: I2045e16cfc676ee75d4d42b0cd652433b2f12715
2013-12-19 16:57:50 -05:00
Dianne Hackborn
fb03058dc9 Update to follow BatteryStats.
Change data use to be based on packets instead of bytes.

Change-Id: I536dd2c2fc3fbeb12689e793f79e5fac984fe3af
2013-12-19 13:10:25 -08:00
Alan Viverette
d07c16107d Additional caption settings for edge styles and window color
Change-Id: Ib967bc566a7b8f7674c696fc05d799e12269ec42
2013-12-19 11:31:36 -08:00
Alan Viverette
65a6ef6f34 Additional captioning fonts
Change-Id: Ib3298f65b602d581fa031576c3b9026bfd6a8672
2013-12-19 11:30:48 -08:00
Baligh Uddin
f2398abe54 Import translations. DO NOT MERGE
Change-Id: Ie72bd5a59406450877a580e2c60c0c81f48ef603
Auto-generated-cl: translation import
2013-12-18 22:15:35 -08:00
Baligh Uddin
26bfaefa84 Import translations. DO NOT MERGE
Change-Id: Iae6f3674d6838e5027505bde8a176c6d1add43df
Auto-generated-cl: translation import
2013-12-16 12:47:52 -08:00
Andres Morales
ef693b5707 Merge "Settings for NFC Unlock" 2013-12-12 17:38:26 +00:00