Jim Miller
103a734b66
Merge "Fix bug where lockout timeout is shown for SIM in keyguard" into klp-dev
2013-10-13 22:54:21 +00:00
Jim Miller
7fa498bf9b
Merge "Disable the camera and search buttons while we're in bouncer mode." into klp-dev
2013-10-13 22:53:37 +00:00
Vineeta Srivastava
158aeaf088
Merge "telephony: redirect call barring MMI code to other purpose" into klp-dev
2013-10-13 22:52:03 +00:00
Aravind Akella
c73810de2f
am 45ca531e: Merge "Adding stepcounter & stepdetector feature strings." into klp-dev
...
* commit '45ca531e77c6f12062bfa7f3e369172582caebe6':
Adding stepcounter & stepdetector feature strings.
2013-10-13 15:50:07 -07:00
Aravind Akella
45ca531e77
Merge "Adding stepcounter & stepdetector feature strings." into klp-dev
2013-10-13 22:48:03 +00:00
duho.ro
23ee84ee5e
telephony: redirect call barring MMI code to other purpose
...
Some operators redirect call barring MMI codes to other purpose.
For instance, *333# should be processed as USSD code with Indonesia
Axis SIM and Indonesia Hutchison SIM. This change is adding an array
for call barring MMI code to config.xml. So, we can redefine the array
for redirecting the call barring MMI codes.
Bug: 10101303
Change-Id: Ib21540a90c64e105cd4bc1864238329d594cd056
Conflicts:
core/res/res/values/config.xml
core/res/res/values/symbols.xml
2013-10-13 15:23:28 -07:00
John Spurlock
d428d64387
am 45d41eba: am f732e37c: Merge "If the panels are disabled, don\'t go opaque on interaction." into klp-dev
...
* commit '45d41eba7a36b865a04b6e99b3826bc92dec5cd1':
If the panels are disabled, don't go opaque on interaction.
2013-10-13 15:16:29 -07:00
John Spurlock
45d41eba7a
am f732e37c: Merge "If the panels are disabled, don\'t go opaque on interaction." into klp-dev
...
* commit 'f732e37c1911831a8d26fd228a00063b9b489a42':
If the panels are disabled, don't go opaque on interaction.
2013-10-13 15:13:11 -07:00
John Spurlock
f732e37c19
Merge "If the panels are disabled, don't go opaque on interaction." into klp-dev
2013-10-13 22:10:31 +00:00
Victoria Lease
7831fd2fdb
am 7d3fb2d6: am 881e1a6b: Merge "do not request location from unavailable providers" into klp-dev
...
* commit '7d3fb2d6c5539226a3adcd20cee48177dd8dc571':
do not request location from unavailable providers
2013-10-13 15:07:51 -07:00
Victoria Lease
7d3fb2d6c5
am 881e1a6b: Merge "do not request location from unavailable providers" into klp-dev
...
* commit '881e1a6b9101175efd027bcf3587c9f9c1dfbfaa':
do not request location from unavailable providers
2013-10-13 15:06:30 -07:00
Victoria Lease
881e1a6b91
Merge "do not request location from unavailable providers" into klp-dev
2013-10-13 22:04:23 +00:00
Adam Powell
6a564f9616
am 7555372f: am 85e5ed63: Merge "Account for translationY when targeting the fast scroller via touch" into klp-dev
...
* commit '7555372f019b06f8849e3e56e6921e505592fe23':
Account for translationY when targeting the fast scroller via touch
2013-10-13 14:33:04 -07:00
Adam Powell
7555372f01
am 85e5ed63: Merge "Account for translationY when targeting the fast scroller via touch" into klp-dev
...
* commit '85e5ed639d58da0ea4fea0b523169fa0f7e81c51':
Account for translationY when targeting the fast scroller via touch
2013-10-13 14:30:28 -07:00
Jim Miller
c57b943044
am 0cdab579: am 39eaeb99: Merge "Update clock to use 14dp instead of 12dp for status info." into klp-dev
...
* commit '0cdab579a44fdb8900b7490b1d9816f0970c6ebb':
Update clock to use 14dp instead of 12dp for status info.
2013-10-13 14:29:34 -07:00
Jim Miller
0cdab579a4
am 39eaeb99: Merge "Update clock to use 14dp instead of 12dp for status info." into klp-dev
...
* commit '39eaeb99c35e8d09ef27d040bf49436d13899a16':
Update clock to use 14dp instead of 12dp for status info.
2013-10-13 14:26:41 -07:00
Adam Powell
85e5ed639d
Merge "Account for translationY when targeting the fast scroller via touch" into klp-dev
2013-10-13 21:26:35 +00:00
Jim Miller
39eaeb99c3
Merge "Update clock to use 14dp instead of 12dp for status info." into klp-dev
2013-10-13 21:24:42 +00:00
Jim Miller
94a52da03b
Update clock to use 14dp instead of 12dp for status info.
...
Fixes bug 11195120
Change-Id: Ifa24ad80f64363e2cc815de67d2e99a27eef3425
2013-10-13 14:13:56 -07:00
Adam Powell
d827389684
Account for translationY when targeting the fast scroller via touch
...
Bug 11188512
Change-Id: Ia8e0088760a18d5862bbe1b904610abd908a190e
2013-10-13 13:35:27 -07:00
Daniel Sandler
0b6b099299
am 71352415: am ce6d9066: Merge "New window cling for immersive mode." into klp-dev
...
* commit '71352415ef3927dba0661c190c627ba381e6745f':
New window cling for immersive mode.
2013-10-13 12:35:48 -07:00
Daniel Sandler
58346d212a
am 816fdb03: am e00ab019: Merge "Easter egg cleanups." into klp-dev
...
* commit '816fdb032fa66c75f8cf0a7b61efc46d032a8403':
Easter egg cleanups.
2013-10-13 12:35:44 -07:00
Daniel Sandler
71352415ef
am ce6d9066: Merge "New window cling for immersive mode." into klp-dev
...
* commit 'ce6d9066b666cb065821163036bdabc9ec8081dd':
New window cling for immersive mode.
2013-10-13 12:33:18 -07:00
Daniel Sandler
816fdb032f
am e00ab019: Merge "Easter egg cleanups." into klp-dev
...
* commit 'e00ab01977b64be9727830f154538f0a035b203b':
Easter egg cleanups.
2013-10-13 12:33:15 -07:00
Svetoslav Ganov
531155ddd2
am 1b6d5412: am d914995a: Merge "Printing from secondary user not working." into klp-dev
...
* commit '1b6d541238264957ffa4d1267fd95b483d449c16':
Printing from secondary user not working.
2013-10-13 12:32:14 -07:00
Daniel Sandler
ce6d9066b6
Merge "New window cling for immersive mode." into klp-dev
2013-10-13 19:30:29 +00:00
Svetoslav Ganov
1b6d541238
am d914995a: Merge "Printing from secondary user not working." into klp-dev
...
* commit 'd914995aad23371cfa24c83608d78214ea7abf1f':
Printing from secondary user not working.
2013-10-13 12:29:45 -07:00
Daniel Sandler
e00ab01977
Merge "Easter egg cleanups." into klp-dev
2013-10-13 19:29:30 +00:00
Daniel Sandler
a953b6d968
New window cling for immersive mode.
...
Bug: 11077915
Change-Id: I6858259b31301b76dee81d3e6fbc534c1cdea661
2013-10-13 15:28:19 -04:00
Svetoslav Ganov
d914995aad
Merge "Printing from secondary user not working." into klp-dev
2013-10-13 19:27:22 +00:00
Svetoslav Ganov
b71808524c
am f5adedba: am 188d0953: Merge "The print dialog in bad state after pressing back from prnt to PDF." into klp-dev
...
* commit 'f5adedba578f0e776a1c21186dd5a2f9ed7214e2':
The print dialog in bad state after pressing back from prnt to PDF.
2013-10-13 12:25:34 -07:00
Svetoslav Ganov
f5adedba57
am 188d0953: Merge "The print dialog in bad state after pressing back from prnt to PDF." into klp-dev
...
* commit '188d09538126914e6ef778a5f528de7b7e0722b5':
The print dialog in bad state after pressing back from prnt to PDF.
2013-10-13 12:24:06 -07:00
Svetoslav Ganov
188d095381
Merge "The print dialog in bad state after pressing back from prnt to PDF." into klp-dev
2013-10-13 19:21:18 +00:00
Daniel Sandler
70966ec922
Easter egg cleanups.
...
Bug: 11171189
Bug: 10240151
Change-Id: Id5a8904bdf6c16302e09f2b48392f99c280a8179
2013-10-13 15:20:52 -04:00
Svetoslav Ganov
b6fd5789ee
am 64655e81: am 65d7b8d0: Merge "The list of active print jobs in print service retunring wrong result." into klp-dev
...
* commit '64655e81640ad5623d6a1b03f04320c16be8b101':
The list of active print jobs in print service retunring wrong result.
2013-10-13 12:18:53 -07:00
Victoria Lease
b30f38383e
do not request location from unavailable providers
...
This commit prevents a system_server crash when applications attempt
to use the fused location provider on systems that do not have a
network location provider available.
Bug: 10845061
Change-Id: I85b33806e05566e8b68ee2ccc401b1c565fd7b9a
2013-10-13 12:15:40 -07:00
Svetoslav Ganov
64655e8164
am 65d7b8d0: Merge "The list of active print jobs in print service retunring wrong result." into klp-dev
...
* commit '65d7b8d0dbf9f1263c5ab0b2ded984b3b1bbde01':
The list of active print jobs in print service retunring wrong result.
2013-10-13 12:15:27 -07:00
Adam Powell
2f6a29ed68
am 6e158a2b: am 18e12147: Merge "Tighten up the KG transport control layout for stability" into klp-dev
...
* commit '6e158a2bcb03bf54424fad6025c7ccd0b91baec0':
Tighten up the KG transport control layout for stability
2013-10-13 12:15:17 -07:00
Svetoslav Ganov
c7db28558d
am 64ee79dd: am 3cccec4c: Merge "The callbacks for tracking a printer called more than once without printer change." into klp-dev
...
* commit '64ee79dd2d0b7a5bdff2590f252661d2fa5f76d7':
The callbacks for tracking a printer called more than once without printer change.
2013-10-13 12:15:13 -07:00
Adam Powell
6e158a2bcb
am 18e12147: Merge "Tighten up the KG transport control layout for stability" into klp-dev
...
* commit '18e121479050a123a98270191f11d780973ad6c5':
Tighten up the KG transport control layout for stability
2013-10-13 12:11:55 -07:00
Svetoslav Ganov
64ee79dd2d
am 3cccec4c: Merge "The callbacks for tracking a printer called more than once without printer change." into klp-dev
...
* commit '3cccec4c6eb9f8494b777cbb1b0e45db80974ac8':
The callbacks for tracking a printer called more than once without printer change.
2013-10-13 12:11:52 -07:00
Svetoslav Ganov
65d7b8d0db
Merge "The list of active print jobs in print service retunring wrong result." into klp-dev
2013-10-13 19:10:12 +00:00
Adam Powell
18e1214790
Merge "Tighten up the KG transport control layout for stability" into klp-dev
2013-10-13 19:07:43 +00:00
Svetoslav Ganov
3cccec4c6e
Merge "The callbacks for tracking a printer called more than once without printer change." into klp-dev
2013-10-13 19:07:26 +00:00
Adam Powell
00298a5126
Tighten up the KG transport control layout for stability
...
Decrease margin between elements to allow the transport controls to
fully fit within the space allotted on some devices. This prevents
unwanted resizing and shuffling when the challenge is swiped downward
to make more room for the current widget page.
Also remove some unused views from features not currently supported.
Bug 11158270
Change-Id: Id5b19a9399760e291495a16def315c7ad6437450
2013-10-13 11:55:08 -07:00
Adam Powell
b0d1ee9033
am e9ced533: am f5176922: Use INVISIBLE instead of GONE to hide KG transport buttons
...
* commit 'e9ced533fab98f8b0272768d3b916be01c73f1c4':
Use INVISIBLE instead of GONE to hide KG transport buttons
2013-10-13 11:14:37 -07:00
Adam Powell
e9ced533fa
am f5176922: Use INVISIBLE instead of GONE to hide KG transport buttons
...
* commit 'f51769221c6defd75cd412964715c0a181e31722':
Use INVISIBLE instead of GONE to hide KG transport buttons
2013-10-13 11:12:03 -07:00
Adam Powell
f51769221c
Use INVISIBLE instead of GONE to hide KG transport buttons
...
Maintain a stable/predictable button layout when a remote control
client shows or hides specific transport control buttons.
Bug 11195246
Change-Id: I0e745150127c5e354ed2752c379e05ea8e0bd33d
2013-10-13 10:39:04 -07:00
John Spurlock
3d7e0958c4
If the panels are disabled, don't go opaque on interaction.
...
Bug:11149893
Change-Id: Id1a56200ead6e7d7e78e665796646b90ed5c0870
2013-10-13 13:34:21 -04:00
Svetoslav Ganov
4a82b455f9
Printing from secondary user not working.
...
The last refactoring of how the print dialog activity is started moved
the code that creates the pending intent from the spooler which is a
per user app to the system process but failed to create the intent
for the right user. Also the code in the print manager service that
puts a notification for a newly isntalled print service was not taking
into account the current user.
bug:11199393
Change-Id: I64ecf9dc1457ec4d58cc1a62e53735bb0793a003
2013-10-12 19:04:57 -07:00