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
Alan Viverette
24ef59737b
Remove dialog offering to download TalkBack
...
GMS devices are required to have at least one accessibility service
installed, and AOSP devices will not have Play Store, so this dialog
is obsolete.
BUG: 10429642
Change-Id: I08db466b305a4a73c35325656d143afdfcecf061
2013-12-10 13:19:13 -08:00
Baligh Uddin
38bd642e23
Remove deprecated locales
...
Bug:11340849
Change-Id: I991b4918581b47f38f32dcad0fe77aa9301414c0
2013-12-09 22:54:15 +00:00
Baligh Uddin
fee406c3f9
Import translations. DO NOT MERGE
...
Change-Id: I3b193d0d03e33dc55b17f50086c7c0ef53853655
Auto-generated-cl: translation import
2013-12-09 11:53:08 -08:00
Andres Morales
fd2b629335
Settings for NFC Unlock
...
Change-Id: Ifaa2717da6c364daa7af073e42fc8f6a097c14bb
2013-12-06 13:50:26 -08:00
Alan Viverette
205cee4c1c
Add preference for caption text opacity
...
BUG: 11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
2013-12-05 11:27:40 -08:00
Alan Viverette
3858233f89
Merge "Remove extra fragment in captioning preferences"
2013-12-05 01:19:54 +00:00
Alan Viverette
4098dba253
Remove extra fragment in captioning preferences
...
BUG: 11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac
2013-12-04 17:19:24 -08:00
Geoff Mendal
5ce341e206
Merge "Import translations. DO NOT MERGE"
2013-12-04 21:39:45 +00:00
Geoff Mendal
bff561cfd7
Import translations. DO NOT MERGE
...
Change-Id: Ib2166418fe68c233b3015b1cab029729abcfcca3
Auto-generated-cl: translation import
2013-12-04 13:33:47 -08:00
Amith Yamasani
482b34eaad
am 1cbb5396
: am 95dd34b4
: am f67aa398
: Merge "Wrong referring to the resource - id/android:id"
...
* commit '1cbb539668cd5c16d3c428d6b1b91d7f3b4e9f72':
Wrong referring to the resource - id/android:id
2013-12-04 21:14:43 +00:00
Amith Yamasani
95dd34b4e4
am f67aa398
: Merge "Wrong referring to the resource - id/android:id"
...
* commit 'f67aa3985d36cace1fbea2537bcdc97f8b6d81ef':
Wrong referring to the resource - id/android:id
2013-12-04 13:05:16 -08:00
Geoff Mendal
ddc4bf8dd1
Import translations. DO NOT MERGE
...
Change-Id: Ia18b0553100026091fe8f0aaecb3b8c9992c5fc1
Auto-generated-cl: translation import
2013-12-02 12:18:41 -08:00
Geoff Mendal
d23a1b4563
Import translations. DO NOT MERGE
...
Change-Id: Ide520d3a801bcfac862133b6a57e5061cc61f0c9
Auto-generated-cl: translation import
2013-11-27 12:23:44 -08:00
Ivan Kovac
14c81b48f7
Wrong referring to the resource - id/android:id
...
We were referring to the resource defined as
@+android:id with R.id. which is wrong. This
fix changes the @+android:id/ to @+id/
Change-Id: Ifdca7347bff31311c9c07aecdb110946e4a239ed
2013-11-26 12:42:24 +01:00