Jeff Sharkey
0994e8708e
am e6890387
: Merge "Allow disabling both MTP and PTP." into jb-mr2-dev
...
* commit 'e6890387dfde592bee4462c3da48d73e35e71a39':
Allow disabling both MTP and PTP.
2013-03-18 22:53:11 +00:00
Jeff Sharkey
e6890387df
Merge "Allow disabling both MTP and PTP." into jb-mr2-dev
2013-03-18 22:48:35 +00:00
Jeff Sharkey
cfd328b64f
Allow disabling both MTP and PTP.
...
Require that MTP and PTP are mutually exclusive when enabled, but
allow them to be both disabled. Users can enable them again under
Storage menu item in Settings.
Bug: 6518257
Change-Id: I43419fa619ce2c62dd5e8c14d6c645d24fd8943a
2013-03-18 15:46:35 -07:00
Todd Poynor
691b1aac40
am ff36b739
: Merge "battery history details: update status bars on any change" into jb-mr2-dev
...
* commit 'ff36b73986439551ee4de4b4f00fdd987a734989':
battery history details: update status bars on any change
2013-03-18 20:48:51 +00:00
Todd Poynor
ff36b73986
Merge "battery history details: update status bars on any change" into jb-mr2-dev
2013-03-18 20:39:40 +00:00
Todd Poynor
56247a63fc
battery history details: update status bars on any change
...
Don't apply the "X axis (time) still within previous pixel" optimization
to the status bars below the battery level graph. Keep the path cursor
position and previous state variables up-to-date in this case.
Bug: 8132455
Change-Id: I09390256e3e71d34813de655a1d01ec054ee778a
2013-03-18 12:30:44 -07:00
Baligh Uddin
6b2283dd29
Import translations. DO NOT MERGE
...
Change-Id: Id6db23783c5987942c50a0779eae422553825db0
Auto-generated-cl: translation import
2013-03-18 11:26:14 -07:00
Baligh Uddin
923dffdff7
Import translations. DO NOT MERGE
...
Change-Id: Id441dc46429d64536d92ce8ad25805aa1780975a
Auto-generated-cl: translation import
2013-03-18 11:23:00 -07:00
Robert Greenwalt
8c34c11b81
am 3c8a4c3b
: am cd1c38cf
: am ae9ebfd1
: Merge "add MVNO field for APN Editor"
...
* commit '3c8a4c3b5939bb9134900266c12f67e33919675e':
add MVNO field for APN Editor
2013-03-17 16:38:54 +00:00
Robert Greenwalt
3c8a4c3b59
am cd1c38cf
: am ae9ebfd1
: Merge "add MVNO field for APN Editor"
...
* commit 'cd1c38cf23e640d878767e189e10dbf26b6a0141':
add MVNO field for APN Editor
2013-03-17 09:31:04 -07:00
Robert Greenwalt
cd1c38cf23
am ae9ebfd1
: Merge "add MVNO field for APN Editor"
...
* commit 'ae9ebfd153d63beb03c018786cb3a7ca7610ce64':
add MVNO field for APN Editor
2013-03-17 09:26:13 -07:00
Robert Greenwalt
ae9ebfd153
Merge "add MVNO field for APN Editor"
2013-03-16 00:55:30 +00:00
Irfan Sheriff
595f4e66a1
am 474958fc
: Merge "Allow user to change scan always available setting" into jb-mr2-dev
...
* commit '474958fc670e18347b2135d0ffd118f921ad7ccb':
Allow user to change scan always available setting
2013-03-14 21:40:00 +00:00
Irfan Sheriff
474958fc67
Merge "Allow user to change scan always available setting" into jb-mr2-dev
2013-03-14 21:32:42 +00:00
Elliott Hughes
78a3c2bcd3
am 1b4c6c1c
: am 93692c36
: am 53309365
: Merge "use date from 1970-01-01 to 2037-12-31 in DatePickerDialog"
...
* commit '1b4c6c1cc9c4f97587c238c6d8f155553bf10e78':
use date from 1970-01-01 to 2037-12-31 in DatePickerDialog
2013-03-14 06:15:40 +00:00
Elliott Hughes
1b4c6c1cc9
am 93692c36
: am 53309365
: Merge "use date from 1970-01-01 to 2037-12-31 in DatePickerDialog"
...
* commit '93692c363213736f1c37413ac35a95d4be9a3bea':
use date from 1970-01-01 to 2037-12-31 in DatePickerDialog
2013-03-13 23:10:56 -07:00
Baligh Uddin
9d7edf94ea
am 7b7b26a1
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '7b7b26a1116026151fd8c5c7856656a0cc9e8f7c':
Import translations. DO NOT MERGE
2013-03-14 04:48:43 +00:00
Baligh Uddin
373cd924d2
Merge "Import translations. DO NOT MERGE"
2013-03-14 04:44:36 +00:00
Baligh Uddin
7b7b26a111
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-03-14 04:44:10 +00:00
Chris Wren
a09856336e
am d0ed1212
: Merge "allow daydream settings to be keyboard driven." into jb-mr2-dev
...
* commit 'd0ed1212a242a9e83a62d060665174c7a1db318e':
allow daydream settings to be keyboard driven.
2013-03-14 02:33:36 +00:00
Elliott Hughes
93692c3632
am 53309365
: Merge "use date from 1970-01-01 to 2037-12-31 in DatePickerDialog"
...
* commit '53309365f60b317b032e55643e9eb0122c6fbb3f':
use date from 1970-01-01 to 2037-12-31 in DatePickerDialog
2013-03-13 18:17:56 -07:00
Elliott Hughes
53309365f6
Merge "use date from 1970-01-01 to 2037-12-31 in DatePickerDialog"
2013-03-14 00:12:48 +00:00
Sungmin Choi
7ccfa0614c
use date from 1970-01-01 to 2037-12-31 in DatePickerDialog
...
In case of using DatePickerDialog, user could select any date
before 1970-01-01. However, the system clock cannot be set to
a date before 1970-01-01.
As a result, user couldn't select date before 1970-01-01.
So, use date from 1970-01-01 to 2037-12-31 of DatePickerDialog.
Steps to reproduce:
1. Settings -> Date & time
2. uncheck Automatic date & time
3. Set Date
4. choose any date before 1970 and Done
Change-Id: I075b3fcaa86df1c314c85dd3dd85474a28b8c637
2013-03-13 17:11:28 -07:00
Chris Wren
d0ed1212a2
Merge "allow daydream settings to be keyboard driven." into jb-mr2-dev
2013-03-13 13:44:42 +00:00
Irfan Sheriff
1019ec10e3
Allow user to change scan always available setting
...
Bug: 8141918
Change-Id: I3595812eccf5f7760f7521b9cbe6dece6fd658f1
2013-03-12 17:57:57 -07:00
Amith Yamasani
9bbdf736c0
am 1f8ce37d
: am 8749f35f
: am 506b68e1
: Merge "Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY"
...
* commit '1f8ce37de84aef7f3f6251e28f32b37b12beffcb':
Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY
2013-03-12 22:51:55 +00:00
Amith Yamasani
1f8ce37de8
am 8749f35f
: am 506b68e1
: Merge "Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY"
...
* commit '8749f35f71c984a189a50e65625983b5cf7274f3':
Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY
2013-03-12 15:46:56 -07:00
Amith Yamasani
8749f35f71
am 506b68e1
: Merge "Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY"
...
* commit '506b68e1c586ea3956c939c4181f11e5a112a2f5':
Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY
2013-03-12 15:42:57 -07:00
Amith Yamasani
506b68e1c5
Merge "Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY"
2013-03-12 21:56:42 +00:00
John Spurlock
20f1707443
am 5ddc1995
: Relative component names for dream settings activities.
...
* commit '5ddc19957fb83cbc890c082052d008066b1f6518':
Relative component names for dream settings activities.
2013-03-12 20:53:44 +00:00
Chris Wren
797805909b
allow daydream settings to be keyboard driven.
...
Bug: 8339092
Change-Id: I9ef93a6633cdaee9bb823da424cd422efffd2475
2013-03-12 16:32:40 -04:00
John Spurlock
5ddc19957f
Relative component names for dream settings activities.
...
If no package name is provided when declaring a dream settings
activity, use the dream service component package name.
Bug:8370189
Change-Id: I36fabc4e7f10fe7deb5bd7a670c66b2c23d5fc20
2013-03-12 15:38:18 -04:00
Baligh Uddin
31dd72a54f
Import translations. DO NOT MERGE
...
Change-Id: I715c94e607e419a8a5445abd2284c36e15842927
Auto-generated-cl: translation import
2013-03-12 11:27:24 -07:00
Baligh Uddin
e94ee9a6ff
Import translations. DO NOT MERGE
...
Change-Id: I0f371df734fee534145886c5f4fa3750670e656a
Auto-generated-cl: translation import
2013-03-12 11:24:10 -07:00
Daniel Sandler
5f42c52a56
am 9471675c
: Merge "Show new and old notifications in the same list." into jb-mr2-dev
...
* commit '9471675c0a280e23186977434efdd0db0ab5bf9d':
Show new and old notifications in the same list.
2013-03-12 16:02:27 +00:00
Daniel Sandler
9471675c0a
Merge "Show new and old notifications in the same list." into jb-mr2-dev
2013-03-12 15:56:00 +00:00
Jean-Baptiste Queru
d20d078915
am 49e63324
: (-s ours) am 565af383
: am 33adccd2
: am 9cff5e3f
: am f4b1aefb
: (-s ours) am 8638eeb4
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '49e633241c872a31559d934bf25d51c9beb65ea0':
2013-03-11 20:56:16 +00:00
Jean-Baptiste Queru
49e633241c
am 565af383
: am 33adccd2
: am 9cff5e3f
: am f4b1aefb
: (-s ours) am 8638eeb4
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '565af3834c8c4c353fd9bbdffcf2b7817b55f09b':
2013-03-11 13:44:36 -07:00
Jean-Baptiste Queru
565af3834c
am 33adccd2
: am 9cff5e3f
: am f4b1aefb
: (-s ours) am 8638eeb4
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '33adccd203ee8303cd0bf489e3f072d362e1705d':
2013-03-11 13:13:41 -07:00
Jean-Baptiste Queru
33adccd203
am 9cff5e3f
: am f4b1aefb
: (-s ours) am 8638eeb4
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '9cff5e3f4a534c5472b8a8e269f34cdca2ebff8c':
2013-03-11 13:00:49 -07:00
Jean-Baptiste Queru
9cff5e3f4a
am f4b1aefb
: (-s ours) am 8638eeb4
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'f4b1aefbaafba7ba290a05bce84f77ee5ad5b043':
2013-03-11 12:42:01 -07:00
Jean-Baptiste Queru
f4b1aefbaa
am 8638eeb4
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '8638eeb4e925009fcc91fd9a9965740c25fe518a':
2013-03-11 12:27:42 -07:00
Jean-Baptiste Queru
8638eeb4e9
Reconcile with jb-mr1-release - do not merge
2013-03-11 12:22:07 -07:00
Henrik Baard
2ac8da37d8
Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY
...
There is an array (NEED_VOICE_CAPABILITY) with all keys that
should not be present in a device that does not have voice
capability.
The key KEY_VIBRATE was not part of this array, it was handled
separately in the code.
Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY and remove the
special treatement.
Change-Id: I96aa066cec373ccbfe89c46b530feb484f6f8164
2013-03-11 13:40:46 +01:00
Przemyslaw Szczepaniak
bf0a295a38
am cd90cf3e
: Another tune of TTS reading settings.
...
* commit 'cd90cf3e078b6da90f7c0e313acc98772d68ad88':
Another tune of TTS reading settings.
2013-03-11 11:49:41 +00:00
Przemyslaw Szczepaniak
cd90cf3e07
Another tune of TTS reading settings.
...
Increased fastest speed to 400. Removed 'extreme' from speeds
names.
Bug: 6705453
Change-Id: I1e82544518d06b865e6cac7393a4604eb29b993a
2013-03-11 11:37:33 +00:00
Amith Yamasani
4793e5d57b
am 36db0471
: am 6e0bff0d
: Merge "Fix the message when Bluetooth is turning off while on the tethering menu."
...
* commit '36db0471bd7240a7d9d5274a1e1933259cd453e6':
Fix the message when Bluetooth is turning off while on the tethering menu.
2013-03-08 18:39:06 +00:00
Amith Yamasani
36db0471bd
am 6e0bff0d
: Merge "Fix the message when Bluetooth is turning off while on the tethering menu."
...
* commit '6e0bff0d1bc52b90a4219b26f93ed41329415098':
Fix the message when Bluetooth is turning off while on the tethering menu.
2013-03-08 10:35:04 -08:00
Amith Yamasani
6e0bff0d1b
Merge "Fix the message when Bluetooth is turning off while on the tethering menu."
2013-03-08 18:24:22 +00:00
Ryan Baxter
232e6fb382
Fix the message when Bluetooth is turning off while on the tethering menu.
...
Currently says "Turning Wifi off..."
This change will display "Turning Bluetooth off..." instead.
Change-Id: I697d19ca4d7a69cc6b3729ad09fcf38bf5ab2427
Signed-off-by: Ryan Baxter <rbryanbaxter@gmail.com >
2013-03-07 20:36:22 -05:00