Baligh Uddin
df480d3a98
Import translations. DO NOT MERGE
...
Change-Id: I78790de98e3587253d8d1718fd86d5bf36422423
Auto-generated-cl: translation import
2014-06-13 15:02:04 -07:00
Przemyslaw Szczepaniak
72a00c459c
Merge "Expose "default tts locale" to the TTS V2 API."
2014-06-10 21:31:35 +00:00
Przemyslaw Szczepaniak
5882320b63
Expose "default tts locale" to the TTS V2 API.
...
Accommodate for the changes in frameworks/base. TtsEngines now
uses Locale objects for setting/getting the default locale
for TTS engines.
Change-Id: I518ace8d16d17b2c36a62e4e9d14a3568a38f68e
2014-06-12 11:44:43 +01:00
vandwalle
4633932a3f
Merge "show frequency within debug settings"
2014-06-12 05:34:42 +00:00
vandwalle
8d9a055f84
show frequency within debug settings
...
Change-Id: I6ebf08a193fc92b7e0289d663f089ba6e871497d
2014-06-12 20:29:27 -07:00
Paul Lawrence
9a960c1cb8
am 5b2ea2fd
: (-s ours) Merge "DO NOT MERGE: Set quantum pattern for crypt dialogs" into lmp-preview-dev
...
* commit '5b2ea2fd6f5d85f05cd48c0824531a65ead7ea3a':
DO NOT MERGE: Set quantum pattern for crypt dialogs
2014-06-13 00:05:02 +00:00
Dianne Hackborn
dd1ad04de2
am b11c9737
: Fix issue #15597136 : n7 not showing estimated discharge time
...
* commit 'b11c97379918fce423bfb0b96a8319a8e698845d':
Fix issue #15597136 : n7 not showing estimated discharge time
2014-06-12 23:57:20 +00:00
Dianne Hackborn
b11c973799
Fix issue #15597136 : n7 not showing estimated discharge time
...
Use battery plugged state to decide whether to show the estimated
discharge time remaining vs. charge time remaining.
Change-Id: I2e0d12871201e7d4927aaa9a94d15bff949a881c
2014-06-12 16:40:56 -07:00
Fabrice Di Meglio
204521626f
resolved conflicts for merge of f9360dbc
to master
...
Change-Id: I2e468d83a7ce5200c59f63b4362e7bee10d0a2eb
2014-06-12 15:46:41 -07:00
Ido Ofir
524a63b493
Small fix to trust agent item in security settings.
...
Change-Id: Ie3157e0c9c68bbab5ba394f61c12d1bbf075bb06
2014-06-12 14:49:25 -07:00
John Spurlock
2bd9eeded4
am 5fe76205
: Settings: Workaround duplicate onActivityCreate
...
* commit '5fe76205b607f193b5925eccfabddc145118b5ea':
Settings: Workaround duplicate onActivityCreate
2014-06-12 20:06:10 +00:00
Alan Viverette
1da878c302
am 8cd7dc23
: Merge "Add Settings theme" into lmp-preview-dev
...
* commit '8cd7dc23ec5e65504ea3f9c8d5869df2b670879d':
Add Settings theme
2014-06-12 19:57:25 +00:00
Dianne Hackborn
3b2be31687
am 9f789fbe
: Merge "I am a Material girl, living in a Material world." into lmp-preview-dev
...
* commit '9f789fbe082792f57dde72e6c5a501cd0441cd6f':
I am a Material girl, living in a Material world.
2014-06-12 18:48:57 +00:00
Fabrice Di Meglio
d5f8823b2a
am deb08839
: Merge "Fix bug #15384992 Setting Dashboard - padding updates" into lmp-preview-dev
...
* commit 'deb088398900bd1c212889c59c9e057795d2b2bd':
Fix bug #15384992 Setting Dashboard - padding updates
2014-06-12 18:48:56 +00:00
Dianne Hackborn
d59d4e25de
am 3864cda8
: Merge "In a document centric world, hiding from recents makes no sense." into lmp-preview-dev
...
* commit '3864cda8fd9f136838481e07c4bd942012eb67ec':
In a document centric world, hiding from recents makes no sense.
2014-06-12 18:37:35 +00:00
John Spurlock
a6f8f8b3d9
am 26ac83df
: Merge "Settings: Remove master swtich from battery saver." into lmp-preview-dev
...
* commit '26ac83df5922430b7d7e3eee46c36c7d856bc47c':
Settings: Remove master swtich from battery saver.
2014-06-12 18:37:34 +00:00
Vinit Deshpande
63328dedb4
am c8e2eeea
: Fix icon location on Wifi Settings
...
* commit 'c8e2eeeaa1666d37abc16d0505a1ef6e9a5bae91':
Fix icon location on Wifi Settings
2014-06-12 18:37:22 +00:00
Fabrice Di Meglio
b0312debfd
am f5440793
: Merge "Fix bug #15558357 java.lang.RuntimeException: Unable to start activity ...ComponentInfo{com.android.settings/com.android.settings.wifi.WifiSetupActivity}" into lmp-preview-dev
...
* commit 'f54407933fd30c0838fcd89d9f4dafaf7af865be':
Fix bug #15558357 java.lang.RuntimeException: Unable to start activity ...ComponentInfo{com.android.settings/com.android.settings.wifi.WifiSetupActivity}
2014-06-12 16:53:47 +00:00
Robert Greenwalt
9bfee0555b
am 746c6ae9
: Merge "Apply LinkProperties changes." into lmp-preview-dev
...
* commit '746c6ae9492f4e571a35fc07cc68a10b059eade5':
Apply LinkProperties changes.
2014-06-12 16:53:44 +00:00
Fabrice Di Meglio
a40da902aa
am caf4b1dd
: Fix bug #15543626 Bluetooth Settings headers need to support Quantum styling
...
* commit 'caf4b1dda2e84760a230944e50569712a39c200c':
Fix bug #15543626 Bluetooth Settings headers need to support Quantum styling
2014-06-12 16:07:29 +00:00
John Spurlock
5fe76205b6
Settings: Workaround duplicate onActivityCreate
...
Bug: 13329308
Change-Id: Ia6b8cf766d517b4e8e5689e33cbb52299471407b
2014-06-12 15:42:12 +00:00
Fabrice Di Meglio
f9360dbcef
Merge "Make the SwitchBar appear immediately" into lmp-preview-dev
2014-06-11 21:23:31 +00:00
Fabrice Di Meglio
138ff8c045
Make the SwitchBar appear immediately
...
- change the way the SwitchBar is shown and hidden
- save its state
- remove the delay transition code
Change-Id: I07260430e6709b42517ca011f6d3c3446a626731
2014-06-12 11:13:23 -07:00
Fabrice Di Meglio
601aad2022
Fix bug #15384992 Setting Dashboard - padding updates
...
- make padding start / end to "0dip" for Preferences ListView
- update also Battery History Chart padding to be compatible
with other layouts
See bug: #15384992 Setting Dashboard - padding updates
Change-Id: I1faae1186322965d7077e92418a507720bab75cf
2014-06-11 16:30:49 -07:00
Alan Viverette
8cd7dc23ec
Merge "Add Settings theme" into lmp-preview-dev
2014-06-11 21:23:31 +00:00
Alan Viverette
5365c626fc
Add Settings theme
...
Also removes unused colors.
Change-Id: Iadf4d72879ea34eab91a9efe02102a6e35be82eb
2014-06-11 18:35:18 -07:00
Fabrice Di Meglio
deb0883989
Merge "Fix bug #15384992 Setting Dashboard - padding updates" into lmp-preview-dev
2014-06-11 21:23:31 +00:00
Vinit Deshpande
c8e2eeeaa1
Fix icon location on Wifi Settings
...
Wifi icons are showing up on the right of the name; which is unlike
other settings; this change fixes that.
Wifi settings are using standard preference layout; so moving to the
new location requires setting different property (icon instead of widget)
on the preference fragment.
Bug: 15117166
Change-Id: I5dd0a843139512d16fb70dd99ed12c3584f57895
2014-06-11 21:22:04 +00:00
Fabrice Di Meglio
209c1febb5
Fix bug #15558357 java.lang.RuntimeException: Unable to start activity
...
...ComponentInfo{com.android.settings/com.android.settings.wifi.WifiSetupActivity}
- add missing attributes to SetupWizard themes
Change-Id: I5d58df8edfcfff4902b714c38dbdbc3933c9323d
2014-06-11 12:11:48 -07:00
Fabrice Di Meglio
caf4b1dda2
Fix bug #15543626 Bluetooth Settings headers need to support Quantum styling
...
- per UX request
- remove the TextView "list separator" styling and use the correct one
Change-Id: I54e41d89dd9b930cbaa04bc5b9ed9a5fd9b8605e
2014-06-11 11:31:35 -07:00
Dianne Hackborn
2f2cbbc760
Merge "Small fixes to power save UI." into lmp-preview-dev
2014-06-10 22:18:15 +00:00
Dianne Hackborn
de159c8d16
Small fixes to power save UI.
...
Use the correct default setting, and don't crash.
Change-Id: I33fd612aba404e13c8bbe9110535dff1cfba12a4
2014-06-10 23:17:01 -07:00
Fabrice Di Meglio
782d0f6891
Merge "Fix bug #15545573 Battery use chart is incorrect for date labels and time axis labels" into lmp-preview-dev
2014-06-10 22:18:15 +00:00
Fabrice Di Meglio
a7a62c5b66
Fix bug #15545573 Battery use chart is incorrect for date labels and time axis labels
...
- use DateFormat.getBestDateTimePattern(...) to get the best Date and Time format
depending on the Locale
- format the label according to the best format
- remove non needed formatting strings
Change-Id: I78b62b9a7c9401e47e62c7161214636bb43324fc
2014-06-10 20:26:42 -07:00
Fabrice Di Meglio
da8babaedf
Update Settings redlines per UX request
...
See bug: #15384992 Setting Dashboard - padding updates
Change-Id: Ie95b6cee701847d7f76f2e2a72aaf8fc64bc4dd9
2014-06-10 19:36:26 -07:00
Fabrice Di Meglio
1c3203e83e
Merge "Update Settings redlines per UX request" into lmp-preview-dev
2014-06-10 22:18:15 +00:00
Dianne Hackborn
9f789fbe08
Merge "I am a Material girl, living in a Material world." into lmp-preview-dev
2014-06-10 22:12:51 +00:00
Dianne Hackborn
3bd46a70c1
I am a Material girl, living in a Material world.
...
Change-Id: I3206041666a3236fdeb5f5897e6d8767137c2b85
2014-06-11 16:27:22 -07:00
Robert Greenwalt
746c6ae949
Merge "Apply LinkProperties changes." into lmp-preview-dev
2014-06-10 22:12:51 +00:00
Robert Greenwalt
a0ac614c08
Apply LinkProperties changes.
...
bug:15142362
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
(cherry picked from commit 51d898fd02
)
2014-06-10 22:42:12 +00:00
Fabrice Di Meglio
f54407933f
Merge "Fix bug #15558357 java.lang.RuntimeException: Unable to start activity ...ComponentInfo{com.android.settings/com.android.settings.wifi.WifiSetupActivity}" into lmp-preview-dev
2014-06-10 22:06:31 +00:00
Dianne Hackborn
3864cda8fd
Merge "In a document centric world, hiding from recents makes no sense." into lmp-preview-dev
2014-06-10 21:49:59 +00:00
Dianne Hackborn
a1b89d0ae8
In a document centric world, hiding from recents makes no sense.
...
Change-Id: I462649a0663cc54c60303392168624483d6a1e17
2014-06-11 15:56:19 -07:00
Paul Lawrence
5b2ea2fd6f
Merge "DO NOT MERGE: Set quantum pattern for crypt dialogs" into lmp-preview-dev
2014-06-10 21:44:22 +00:00
Paul Lawrence
60870987ad
DO NOT MERGE: Set quantum pattern for crypt dialogs
...
The bug makes the decrypt screen for patterns very hard to use
(white on white).
Bug: 14883421
Change-Id: Icd2c99c3f483d1a9b6571fa1e124322fbf6f3289
(cherry picked from commit 26abe64c3d
)
2014-06-12 14:49:07 +00:00
John Spurlock
26ac83df59
Merge "Settings: Remove master swtich from battery saver." into lmp-preview-dev
2014-06-10 21:38:43 +00:00
John Spurlock
5845d98a8a
Settings: Remove master swtich from battery saver.
...
And make it a normal switch called "Always on". Better reflects
the actual effect.
Change-Id: I9f801ddfff39591cb19d665f61a1a05bda317888
2014-06-11 18:44:24 -04:00
Julia Reynolds
253b111a3d
Merge "Remove PIN from users page - use disallow_add/remove_user restrictions."
2014-06-10 21:38:43 +00:00
Paul Lawrence
9b17be0d4b
Merge "Set quantum pattern for crypt dialogs"
2014-06-11 23:10:23 +00:00
Dianne Hackborn
ff0a8a2f43
am 2f2cbbc7
: Merge "Small fixes to power save UI." into lmp-preview-dev
...
* commit '2f2cbbc760c23d89c5b0255378bbf5cb074a6988':
Small fixes to power save UI.
2014-06-12 00:03:50 +00:00