Jeff Sharkey
1c2d34f2f8
am 8111e3d7
: Merge "Read NumberPicker value after finishing edit." into jb-mr2-dev
...
* commit '8111e3d734b35588377cfcce412c7cdcb0da8aec':
Read NumberPicker value after finishing edit.
2013-03-25 22:18:47 +00:00
Jeff Sharkey
8111e3d734
Merge "Read NumberPicker value after finishing edit." into jb-mr2-dev
2013-03-25 22:12:35 +00:00
Jeff Sharkey
d277de911d
Read NumberPicker value after finishing edit.
...
Bug: 6881204
Change-Id: I736c9205b69914353f88028a3794db6cd43c4c74
2013-03-25 15:11:25 -07:00
Baligh Uddin
164e73ca4b
Merge "Import translations. DO NOT MERGE"
2013-03-25 21:03:39 +00:00
Baligh Uddin
d4693817a8
am a042cbf6
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'a042cbf653679af3208905178f58ea5ec035ae1d':
Import translations. DO NOT MERGE
2013-03-25 21:02:43 +00:00
Baligh Uddin
a042cbf653
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-03-25 20:57:42 +00:00
Baligh Uddin
5fec9e5507
Import translations. DO NOT MERGE
...
Change-Id: I9a68ce9bb321f72d21f45500427ef6c7c05d3e82
Auto-generated-cl: translation import
2013-03-25 13:26:38 -07:00
Baligh Uddin
1b51d62a32
Import translations. DO NOT MERGE
...
Change-Id: I898d0fd6ce299f2ffb6cc38805baf566e83f501f
Auto-generated-cl: translation import
2013-03-25 13:22:50 -07:00
Eric Laurent
45cfac3e10
am 18e688bd
: Merge "Do not display volume settings if volume is fixed" into jb-mr2-dev
...
* commit '18e688bdd27b2e8821ec08c6775a0b0dae1b9f71':
Do not display volume settings if volume is fixed
2013-03-25 17:16:28 +00:00
Eric Laurent
18e688bdd2
Merge "Do not display volume settings if volume is fixed" into jb-mr2-dev
2013-03-25 17:09:49 +00:00
Baligh Uddin
66f552eefd
am fd906e28
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fd906e28d8c105bf31051228afaa100fb10f3420':
Import translations. DO NOT MERGE
2013-03-22 18:54:38 +00:00
Baligh Uddin
9c65b1652e
Import translations. DO NOT MERGE
...
Change-Id: Ieb6e68acb5825785163fd24b92568c97f3b66851
Auto-generated-cl: translation import
2013-03-22 11:40:40 -07:00
Baligh Uddin
fd906e28d8
Import translations. DO NOT MERGE
...
Change-Id: I2a3ca4e806acc10e961d5720761de5f9e608455a
Auto-generated-cl: translation import
2013-03-22 11:37:52 -07:00
Irfan Sheriff
4e77e3b7d3
am 358d1825
: Fix build
...
* commit '358d1825a4f51b9d28b437cbf02df842a56a6d15':
Fix build
2013-03-22 00:57:55 +00:00
Irfan Sheriff
358d1825a4
Fix build
...
Change-Id: Ic2eacc240e693cb523c9189c7bd62e1bf17fd85c
2013-03-21 17:49:31 -07:00
Eric Laurent
296d9bb612
Do not display volume settings if volume is fixed
...
When the configuration option config_useFixedVolume is true
indicating that stream volumes cannot be modified, the volume
settings submenu is not available.
Bug 8161458
Change-Id: I6d76a2f85c642778ae8c4caa7347b50f659c1def
2013-03-21 17:40:20 -07:00
Irfan Sheriff
b3f78d9972
am 871bbbd0
: Merge "Notify user that scans are still active" into jb-mr2-dev
...
* commit '871bbbd0d64bab970f7fba228af2779c1fcbcc46':
Notify user that scans are still active
2013-03-22 00:19:51 +00:00
Irfan Sheriff
871bbbd0d6
Merge "Notify user that scans are still active" into jb-mr2-dev
2013-03-22 00:15:13 +00:00
Irfan Sheriff
d3863aa664
Notify user that scans are still active
...
Bug: 8141918
Change-Id: I115ce2ac57125b8ffbb34245dc25effd4b3bebb0
2013-03-21 17:09:43 -07:00
Daniel Sandler
da8690558b
am 05f9c75a
: Merge "Add some extra info to the notification list rows." into jb-mr2-dev
...
* commit '05f9c75a7b9793f5a712029aad365926aaddf4a8':
Add some extra info to the notification list rows.
2013-03-21 22:06:41 +00:00
Daniel Sandler
9aee0b475f
am 158d57a5
: Merge "Optimizations in the notification list:" into jb-mr2-dev
...
* commit '158d57a5d1820cd1c4479ab71da55c8840a964e1':
Optimizations in the notification list:
2013-03-21 22:06:40 +00:00
Daniel Sandler
d744a53acf
am 76c4a1bf
: Merge "Keep up with INotificationListener changes." into jb-mr2-dev
...
* commit '76c4a1bf7c1f8e2b895bd99aa4815954e9e9bc16':
Keep up with INotificationListener changes.
2013-03-21 22:06:40 +00:00
Daniel Sandler
05f9c75a7b
Merge "Add some extra info to the notification list rows." into jb-mr2-dev
2013-03-21 22:02:43 +00:00
Daniel Sandler
158d57a5d1
Merge "Optimizations in the notification list:" into jb-mr2-dev
2013-03-21 22:02:36 +00:00
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