John Spurlock
1ae1373aed
Merge "Wire up new hideycling ok button to persist setting." into klp-dev
2013-10-13 23:27:20 +00:00
John Spurlock
47e3de2baa
Wire up new hideycling ok button to persist setting.
...
Otherwise you'll see it every time.
Bug:11077915
Change-Id: I2ec725459f6ec133c1b82e9788a80dede6e87343
2013-10-13 19:20:04 -04:00
Craig Mautner
7c495cbf68
Revert "Restore wallpaper positioning between apps."
...
This reverts commit faf1a40382b61d9cabab82e6e835603511046564.
Bug 10932680 is back where it was.
Change-Id: I5058db837941769f25f09e3fafd9c19ef370df8e
2013-10-13 23:19:45 +00:00
Dianne Hackborn
f2896e2897
am 9e4403d4: am ef53fcc3: Merge "Fix issue #11199654 : Action bar enter animation skips frames when cleared by the system" into klp-dev
...
* commit '9e4403d4c676d5c97f39ab4fb2debf1ca2d060ec':
Fix issue #11199654 : Action bar enter animation skips frames when cleared by the system
2013-10-13 16:09:25 -07:00
Dianne Hackborn
9e4403d4c6
am ef53fcc3: Merge "Fix issue #11199654 : Action bar enter animation skips frames when cleared by the system" into klp-dev
...
* commit 'ef53fcc3efca382f17cc23dfda6d91b901941173':
Fix issue #11199654 : Action bar enter animation skips frames when cleared by the system
2013-10-13 16:06:23 -07:00
Dianne Hackborn
ef53fcc3ef
Merge "Fix issue #11199654 : Action bar enter animation skips frames when cleared by the system" into klp-dev
2013-10-13 23:04:13 +00:00
Jim Miller
5117168815
am 7f210cbb: am 103a734b: Merge "Fix bug where lockout timeout is shown for SIM in keyguard" into klp-dev
...
* commit '7f210cbbea61bae3c70e230d84fdae4f1f9d00b3':
Fix bug where lockout timeout is shown for SIM in keyguard
2013-10-13 16:02:29 -07:00
Jim Miller
8360bde120
am d04244d4: am 7fa498bf: Merge "Disable the camera and search buttons while we\'re in bouncer mode." into klp-dev
...
* commit 'd04244d482b3062b1790a636779785a50243b4cc':
Disable the camera and search buttons while we're in bouncer mode.
2013-10-13 16:02:26 -07:00
Vineeta Srivastava
9d325d3339
am b2fc8791: am 158aeaf0: Merge "telephony: redirect call barring MMI code to other purpose" into klp-dev
...
* commit 'b2fc8791186589e531bcff42fd275f4f8372a399':
telephony: redirect call barring MMI code to other purpose
2013-10-13 16:02:23 -07:00
Jim Miller
7f210cbbea
am 103a734b: Merge "Fix bug where lockout timeout is shown for SIM in keyguard" into klp-dev
...
* commit '103a734b66b797e58d7d77a8fef6a68b53428930':
Fix bug where lockout timeout is shown for SIM in keyguard
2013-10-13 15:57:15 -07:00
Jim Miller
d04244d482
am 7fa498bf: Merge "Disable the camera and search buttons while we\'re in bouncer mode." into klp-dev
...
* commit '7fa498bf9bec98a4462c15eb10d5fd0e3c01d3bd':
Disable the camera and search buttons while we're in bouncer mode.
2013-10-13 15:57:12 -07:00
Vineeta Srivastava
b2fc879118
am 158aeaf0: Merge "telephony: redirect call barring MMI code to other purpose" into klp-dev
...
* commit '158aeaf0884701d071f9929574e8626111556554':
telephony: redirect call barring MMI code to other purpose
2013-10-13 15:57:09 -07:00
Dianne Hackborn
021d243d6d
Fix issue #11199654 : Action bar enter animation skips frames when cleared by the system
...
We have become too aggressive about not allowing windows to draw while windw
animations are running, basically not allowing any drawing in any window when
there is any window animation. So if you did a relayout while the status bars
were being animated, your window would stop drawing until that status bar
animation was complete.
This change relaxes those rules in two ways:
- A particular window will only be told to stop updating when *it* is
currently involved in a window animation. So animations in status bars
will not stop app windows from update, and vice versa.
- If a window receives input events while it is in the "do not update"
state, we will immediately terminate that state and start allowing it to
draw. If the user is actually interacting with a window, we don't want
to wait to show feedback.
Change-Id: I72574eec048aee53115b46a78686cf27f42c42f7
2013-10-13 15:56:29 -07:00
Aravind Akella
67af9ce31e
am c73810de: am 45ca531e: Merge "Adding stepcounter & stepdetector feature strings." into klp-dev
...
* commit 'c73810de2fa9184d808719ccdfe5f1a8b9864135':
Adding stepcounter & stepdetector feature strings.
2013-10-13 15:55:32 -07:00
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
Victoria Lease
b9b77aecf2
no layout = no visibility
...
This fixes an Editor crash when the associated TextView's Layout
is null.
Bug: 11165608
Change-Id: I061c0db6eef95bf39a7696ad6e6f919bd22bfb11
2013-10-13 15:12:52 -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