Daniel Sandler
76c4a1bf7c
Merge "Keep up with INotificationListener changes." into jb-mr2-dev
2013-03-21 22:02:21 +00:00
Amith Yamasani
92d125cbb1
am 8cb10bd8
: Merge "Application restrictions UI" into jb-mr2-dev
...
* commit '8cb10bd8fc59ce510ae015e8280f99383cddf9c5':
Application restrictions UI
2013-03-21 07:40:36 +00:00
Amith Yamasani
8cb10bd8fc
Merge "Application restrictions UI" into jb-mr2-dev
2013-03-21 06:14:39 +00:00
Amith Yamasani
233592bb43
Application restrictions UI
...
Refactored User Settings UI to have two types of users.
Display a list of apps to select.
Edit user restrictions.
Handle saving and updating RestrictionEntry items via
User Manager.
Change-Id: I3ad5aa71d5ef66dffd39e17ba0556f075ac10a0f
2013-03-20 22:23:45 -07:00
Irfan Sheriff
0058373a87
am adab9274
: Merge "system activity for scan always available setting" into jb-mr2-dev
...
* commit 'adab9274c428a445c64cf350d9f1242f21746bdd':
system activity for scan always available setting
2013-03-20 23:04:43 +00:00
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
431a3a84da
am cdd47208
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'cdd47208ad3ff8c0cfa152774c282795d1497d63':
Import translations. DO NOT MERGE
2013-03-20 19:55:56 +00:00
Baligh Uddin
6ea2b6c599
Merge "Import translations. DO NOT MERGE"
2013-03-20 19:51:56 +00:00
Baligh Uddin
cdd47208ad
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-03-20 19:51:36 +00:00
Baligh Uddin
bf01c8f8e4
Import translations. DO NOT MERGE
...
Change-Id: I147a44fac0a37631a71055a7afb5a12edd81fd31
Auto-generated-cl: translation import
2013-03-20 11:10:48 -07: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
8380cf569d
am 58e18de7
: am f8db32d8
: am 74fd506b
: Merge "Enable Ethernet tab in data usage"
...
* commit '58e18de7598cdd1fdfb6e302297bd76905a299a5':
Enable Ethernet tab in data usage
2013-03-20 17:30:55 +00: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
f76bc8b0b7
am 9f5b4919
: Merge "Enable Back during setup wizard" into jb-mr2-dev
...
* commit '9f5b49192d281eb24cbe4e12d989857e9e195b03':
Enable Back during setup wizard
2013-03-19 21:13:22 +00: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
Daniel Sandler
95860491fe
Add some extra info to the notification list rows.
...
Change-Id: Ie6ad130bd0e6daf8562c477f0297ba914d3f22d1
2013-03-19 00:12:41 -04:00
Daniel Sandler
738b8715ab
Optimizations in the notification list:
...
- sort notifications by timestamp
- deal with notification bursts better by waiting to
refresh the list until things settle down
Change-Id: Ie41051afcb0a7a917f2a97a3311628b34626c125
2013-03-19 00:12:41 -04:00
Daniel Sandler
e16dcfb16a
Keep up with INotificationListener changes.
...
Requires change Ia69f2ba0 in f/b.
Change-Id: I4a8f719150651bbf94c48ef83fcad2f82db9582b
2013-03-18 23:06:05 -04:00
Baligh Uddin
992e0f21be
am 3139569b
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '3139569bdf1b344af0d98e42e489fa433b1f41a0':
Import translations. DO NOT MERGE
2013-03-18 23:00:56 +00:00
Baligh Uddin
6a609c0163
Merge "Import translations. DO NOT MERGE"
2013-03-18 22:58:35 +00:00
Baligh Uddin
3139569bdf
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-03-18 22:58:19 +00:00
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