drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,930 Commits 1 Branch 0 Tags
Commit Graph

113930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Eino-Ville Talvala
914970b473 am d38b1302: Merge "DO NOT MERGE: Hide new camera API." into klp-dev 
* commit 'd38b1302b7506ae7eef6c6680228c0f07f6e1895':
  DO NOT MERGE: Hide new camera API.
 2013-10-12 18:53:54 -07:00
Eino-Ville Talvala
d38b1302b7 Merge "DO NOT MERGE: Hide new camera API." into klp-dev 2013-10-13 01:50:30 +00:00
Aravind Akella
068b0c05fe Adding stepcounter & stepdetector feature strings. 
Change-Id: Ic8cc95612f776db7cb1d1c13a228d5cd8ed64f56
 2013-10-12 18:47:00 -07:00
Craig Mautner
cd32edfb0f am 5b64aa68: Merge "Restore wallpaper positioning between apps." into klp-dev 
* commit '5b64aa689f22fd72107db26a7ba42654599144e4':
  Restore wallpaper positioning between apps.
 2013-10-12 18:43:19 -07:00
Craig Mautner
22e4a1b8e5 am 10ea1978: Merge "Only return to home if the foreground task is removed." into klp-dev 
* commit '10ea197826a2878f17a53dfc9ff4da4ee674244c':
  Only return to home if the foreground task is removed.
 2013-10-12 18:43:15 -07:00
Craig Mautner
5b64aa689f Merge "Restore wallpaper positioning between apps." into klp-dev 2013-10-13 01:40:44 +00:00
Craig Mautner
10ea197826 Merge "Only return to home if the foreground task is removed." into klp-dev 2013-10-13 01:40:02 +00:00
Svetoslav Ganov
79ddf83522 am bececbfa: Merge "Printed document size not persisted." into klp-dev 
* commit 'bececbfae675055aa60ea21c5b8bd3dbb8acdbac':
  Printed document size not persisted.
 2013-10-12 17:34:47 -07:00
Svetoslav Ganov
bfc8edcf55 am 63ce2019: Merge "Fail only scheduled print jobs, i.e. handed to a service, if the service is disabled." into klp-dev 
* commit '63ce201963339d937cf66fed7870356291dc57ad':
  Fail only scheduled print jobs, i.e. handed to a service, if the service is disabled.
 2013-10-12 17:34:43 -07:00
Svetoslav Ganov
bececbfae6 Merge "Printed document size not persisted." into klp-dev 2013-10-13 00:32:47 +00:00
Svetoslav Ganov
63ce201963 Merge "Fail only scheduled print jobs, i.e. handed to a service, if the service is disabled." into klp-dev 2013-10-13 00:32:12 +00:00
Svetoslav Ganov
7ff610ee02 The print dialog in bad state after pressing back from prnt to PDF. 
When selecting print to PDF and then pressing back to return from the
storage UI activity, the print dialog was in a state where nothing
is selected.

bug:10983508

Change-Id: I9c14b5fa18e812104ade6a2eacd626b5f7387111
 2013-10-12 17:24:05 -07:00