Irfan Sheriff
adab9274c4
Merge "system activity for scan always available setting" into jb-mr2-dev
2013-03-20 23:00:03 +00:00
Baligh Uddin
cdd47208ad
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-03-20 19:51:36 +00:00
Irfan Sheriff
50f341dcd9
system activity for scan always available setting
...
Takes user permission via a dialog to enable scans to be always available.
Bug: 8141918
Change-Id: I1e5e45e514726c2cbfd86e747123e477e00fd7ed
2013-03-20 11:08:15 -07:00
Baligh Uddin
3a21aad625
Import translations. DO NOT MERGE
...
Change-Id: I84b3e376481c87e9b202d5a6154dc025048ff184
Auto-generated-cl: translation import
2013-03-20 11:07:54 -07:00
Jeff Sharkey
58e18de759
am f8db32d8
: am 74fd506b
: Merge "Enable Ethernet tab in data usage"
...
* commit 'f8db32d8af46d1cb1a10cf9d49dde7ecd4ce507d':
Enable Ethernet tab in data usage
2013-03-20 10:23:33 -07:00
Jeff Sharkey
f8db32d8af
am 74fd506b
: Merge "Enable Ethernet tab in data usage"
...
* commit '74fd506bba9643221479ba11ae56a6657ed48279':
Enable Ethernet tab in data usage
2013-03-20 10:21:53 -07:00
Jeff Sharkey
74fd506bba
Merge "Enable Ethernet tab in data usage"
2013-03-20 17:08:25 +00:00
Jaewan Kim
ffce9c1e9a
Enable Ethernet tab in data usage
...
mStateSession is not initialized at the time hasEthernet is called to
set mShowEthernet, so Ethernet tab is not shown at the startup.
In this case, if the device doesn't support mobile network, user cannot
even select it from the context menu.
Bug: 8365419
Change-Id: I441971f18346c34a3adf3f18d9355075d9dce3f0
2013-03-20 11:22:30 +09:00
Russell Brenner
9f5b49192d
Merge "Enable Back during setup wizard" into jb-mr2-dev
2013-03-19 21:09:00 +00:00
Russell Brenner
eca454ebc2
Enable Back during setup wizard
...
Aside from enabling the system back button, updated the result codes
to distinguish back (RESULT_CANCEL) from skip (RESULT_SKIP).
This CL should have been uploaded along with http://ag/284254 ,
which has already been merged.
Bug: 6477759
Bug: 8409375
Change-Id: I031acda1d675ee79a3166a51073113093211709d
2013-03-19 14:03:11 -07:00
Baligh Uddin
3139569bdf
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-03-18 22:58:19 +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
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
923dffdff7
Import translations. DO NOT MERGE
...
Change-Id: Id441dc46429d64536d92ce8ad25805aa1780975a
Auto-generated-cl: translation import
2013-03-18 11:23:00 -07: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
474958fc67
Merge "Allow user to change scan always available setting" into jb-mr2-dev
2013-03-14 21:32:42 +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
7b7b26a111
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-03-14 04:44:10 +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
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
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
e94ee9a6ff
Import translations. DO NOT MERGE
...
Change-Id: I0f371df734fee534145886c5f4fa3750670e656a
Auto-generated-cl: translation import
2013-03-12 11:24:10 -07: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
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
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
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
Daniel Sandler
c00e410b35
Show new and old notifications in the same list.
...
Relies on change-id I008afefc in f/b.
Change-Id: Id474639910ec54f129395e1734cf92203879723d
2013-03-07 16:39:06 -05:00
Daniel Sandler
8194449cf3
Merge "Listen for the current user's notifications only." into jb-mr2-dev
2013-03-07 20:46:15 +00:00
Daniel Sandler
c97593b9fd
Listen for the current user's notifications only.
...
Bug: 8328357
Change-Id: I4fe21ed5c49a1eafee7ede1d4e5e9cb8f34d5120
2013-03-07 15:43:30 -05:00
Baligh Uddin
a3317ee377
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-03-07 04:43:10 +00:00
Jeff Sharkey
22ace5059a
Merge "Remove guava dependency to speed up build." into jb-mr2-dev
2013-03-06 19:49:09 +00:00