117586 Commits

Author SHA1 Message Date
Kenny Root
7878883ed9 Merge "Remove direct reference to X509CertImpl" 2013-10-14 20:59:48 +00:00
Jim Miller
0ed6d68496 Add additional MNC overlays
Fixes bug 10518893

Change-Id: If8f46202f593e545fe38c4803481b266b60543b9
2013-10-14 13:57:46 -07:00
Craig Mautner
5800443e2d Move the wallpaper beneath the keyguard.
If the keyguard is the wallpaper target the wallpaper cannot sit at
the bottom of the stack and must be directly beneath the keyguard.
Otherwise keep it at the bottom of the window stack.

App animations when the keyguard is showing should not be disabled if
the keyguard is also animating.

Fixes bug 10858941.
Fixes bug 10932680.

Change-Id: I8399837f6510ea16003f68b165e67439f3571ef4
2013-10-14 13:52:28 -07:00
Svetoslav Ganov
2f0ec7af06 Update the print spooler action bar icon.
1. Updated the print spooler icon shown in the action bar
   when searching for printers in the all printers activity.

2. If the current printer's capabilities are not immediately
   available the page count label in the dialog contained the
   argument placeholders.

bug:10983508

Change-Id: Id4f78d6cc31647f043f8e3044ab54f30584d1ebe
2013-10-14 13:49:17 -07:00
Kenny Root
27e549428e Remove direct reference to X509CertImpl
This should use the system default X.509 certificate provider.

Change-Id: Ibdfd800a9d10f9dc566a360401efe7c3dc6cef5d
2013-10-14 13:39:43 -07:00
Adam Lesinski
cf18b47ed4 Wrap measurement optimization in targetSdk check
A measurement optimization has exposed some apps that are relying
on incidental layout requests to have themselves update. With the
optimization enabled, these apps break.

Apps targetted at older versions of Android should not
break due to this optimization.

bug:11192311
Change-Id: Id5fc7f83ec2cb1541d3d0d16f951cd57c0afaccd
2013-10-14 13:32:02 -07:00
Nick Kralevich
e5a9908675 am 1f5da180: am f730b759: am d6c2ccb2: Merge "core: fix arithmetic on a pointer to void"
* commit '1f5da180b425c2c568a47b7080345412d0078a13':
  core: fix arithmetic on a pointer to void
2013-10-14 13:19:52 -07:00
Nick Kralevich
1f5da180b4 am f730b759: am d6c2ccb2: Merge "core: fix arithmetic on a pointer to void"
* commit 'f730b7599d18c49e132b73856697b7444cdf091f':
  core: fix arithmetic on a pointer to void
2013-10-14 13:17:20 -07:00
Svetoslav
9d843e09ca Layout may be called with invalid print attributes.
If a print service reports a printer with no capabilities and then
removes and adds the same printer again with no capabilities we can
call layout with invalid attributes. While the print service should
not do that we must not crash. The reason is that the print dialog
code was lacking a check whether something changed before handling
the change of the current printer. This resulted in calling layout
even though we still do not have the printer capabilities resulting
in passing bogus print attributes to the app.

bug:11216402

Change-Id: Icb9161930a70a7f9ead589a0ab0b4eb35091666f
2013-10-14 13:15:35 -07:00
Nick Kralevich
f730b7599d am d6c2ccb2: Merge "core: fix arithmetic on a pointer to void"
* commit 'd6c2ccb25f08447b0358173ff64725d28f207d7b':
  core: fix arithmetic on a pointer to void
2013-10-14 13:14:37 -07:00
Nick Kralevich
d6c2ccb25f Merge "core: fix arithmetic on a pointer to void" 2013-10-14 20:11:05 +00:00
Vineeta Srivastava
1680cfd803 Merge "Modify config.xml for tethering APN information." into klp-dev 2013-10-14 19:57:30 +00:00
kenneeth.ryu
16359089ea Modify config.xml for tethering APN information.
1. Remove Tethering profile for Spain Orange(214-03). Because Orange and Euskaltel use same MCC-MNC but have separate tethering APN.
- Spain Orange(214-03) use "internet" apn.
- Spain Euskaltel(214-03) use "internet.euskaltel.mobi" apn.

2. Remove Tethering profile for Spain Telefonica(214-07). Because Telefonica and Jazztel use same MCC-MNC but have separate tethering APN.
- Spain Telefonica (214-07) use "movistar.es" apn.
- Spain Jazztel (214-07) use "jazzinternet" apn.

3. Remove Tethering profile for France Orange(208-01). Because Orange and Carrefour/NRJ/Tele2/Virgin/use same MCC-MNC but have separate tethering APN.
- France Orange (208-01) use "orange.fr" apn.
- France Carrefour (208-01) use "ofnew.fr" apn.

4. Remove Tethering profile for UK T-Mobile(234-33). Because T-Mobile and Orange were merger so doesn't use "consumerbroadband" apn for tethering anymore.

5. Remove Tethering profile for HK 1O1O(454-00). Because 1O1O and NWMOBILE use same MCC-MNC but have separate tethering APN.
- HK 1O1O(454-00) use "lte.internet" apn.
- HK NWMOBILE(454-00) use "NWMOBILE" apn.

6. Remove Tethering profile for HK 3(454-03). Because 3 LTE and 3G have separate tethering apn.
- HK 3 LTE use "lte.three.com.hk" apn.
- HK 3 3G use "mobile.three.com.hk" apn.

7. Update Tethering profile for Orange(340-01). The format of tethering profile was wrong.

8. Add Tethering profile for Mexico Iusacell(334-050).

9. Add Tethering profile for Portugal Optimus(268-03).

Bug: 11176211

Change-Id: I453ff8b745ee4f483bfdd6c362bd67ce50ba8b7a

Conflicts:
	core/res/res/values-mcc234-mnc33/config.xml
2013-10-14 12:33:37 -07:00
synergydev
01994c79f4 core: fix arithmetic on a pointer to void
Use char* instead of void* for this
pointer arithmetic. Fixes the following:

error: arithmetic on a pointer to void
buf = buf + offset;
      ~~~ ^

Change-Id: I6cfc92c9240fda66a52e780cda7820fdba76914a
2013-10-14 12:27:22 -07:00
Martijn Coenen
35bf628852 NFC card emulation API docs.
Bug: 10550319
Change-Id: I3023639d728aa76af89d15e0491b86c7c641648e
2013-10-14 20:58:53 +02:00
Jeff Sharkey
3a58678ac2 am 7a531be1: am 94758633: am b5da7b23: Merge "Throw when taking non-existant Uri permission." into klp-dev
* commit '7a531be13bc9ba6218747c185cd199c9e864c60f':
  Throw when taking non-existant Uri permission.
2013-10-14 11:54:21 -07:00
Daniel Sandler
dd73ee4d0a Add a config resource to enable translucent bars globally.
Setting config_enableTranslucentDecor to false will not
prevent clients from adding FLAG_TRANSLUCENT_NAVIGATION or
STATUS to the window or using the TransluentDecor themes,
but it will prevent View.STATUS_BAR_TRANSLUCENT and
View.NAVIGATION_BAR_TRANSLUCENT from being propagated to the
SystemUI so these requests will not be honored.

Bug: 11182618
Change-Id: I8be6a3a565acf0987ff12f18f1c7e67c96d563c3
2013-10-14 14:52:44 -04:00
John Spurlock
cf2d725b55 resolved conflicts for merge of f1dd32c8 to master
Change-Id: Ied96bfce952fa95eeceb1b8cf64e53830d4d03ac
2013-10-14 14:49:58 -04:00
Scott Main
306ed4fd4f am 3a920545: am 2cc953f1: am 9006c422: more documentation for SEND_RESPOND_VIA_MESSAGE
* commit '3a92054541864c1831fc1a67ea711acd2c4f3690':
  more documentation for SEND_RESPOND_VIA_MESSAGE
2013-10-14 11:34:58 -07:00
Christopher Tate
b83bba7c35 Merge "Log noisily on uid vs user-handle confusion in the settings provider" into klp-dev 2013-10-14 18:31:07 +00:00
Scott Main
3a92054541 am 2cc953f1: am 9006c422: more documentation for SEND_RESPOND_VIA_MESSAGE
* commit '2cc953f19ad5b7bd2ff1ef4d239cd638daf90744':
  more documentation for SEND_RESPOND_VIA_MESSAGE
2013-10-14 11:30:51 -07:00
Victoria Lease
f3bd8d4843 am 4c4a469c: am 677687c2: am edbab7b5: Merge "no layout = no visibility" into klp-dev
* commit '4c4a469cbfe61f50c23b70d8b2e63f7b661745c7':
  no layout = no visibility
2013-10-14 11:28:52 -07:00
Scott Main
f61a49d66c am 4c333965: am a8891de3: am 9ecc2904: am da5d7027: am 5a99a702: am 4dfe8944: Merge "add docs about managing app memory" into jb-mr2-docs
* commit '4c333965089935b6d02b4d92707560d0fa8539f5':
  add docs about managing app memory
2013-10-14 11:28:49 -07:00
Craig Mautner
2e5ab4bf24 am aaae59c3: am 23d4edde: am ea7c1e24: Merge "Add null check when determining mOnTopOfHome" into klp-dev
* commit 'aaae59c39ce0142bdef3067b9acd039b3c743c6c':
  Add null check when determining mOnTopOfHome
2013-10-14 11:28:42 -07:00
Scott Main
2cc953f19a am 9006c422: more documentation for SEND_RESPOND_VIA_MESSAGE
* commit '9006c422909a13e61aa10bac385f05940f345b3b':
  more documentation for SEND_RESPOND_VIA_MESSAGE
2013-10-14 11:28:41 -07:00
Baligh Uddin
1b6e8e20f3 am f7425929: (-s ours) am c61b90f0: (-s ours) am 2261bef3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'f7425929e8bfd89bbf53e301d767f7586d082acb':
  Import translations. DO NOT MERGE
2013-10-14 11:28:37 -07:00
Baligh Uddin
b8b289b18a am ede9fb7a: (-s ours) am 8ed80a44: (-s ours) am 5c364f3c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'ede9fb7a27f02877dfea0c3399a04c09621979cc':
  Import translations. DO NOT MERGE
2013-10-14 11:28:29 -07:00
Baligh Uddin
ddc65a7fe5 am 33dd2835: (-s ours) am f0264ab8: (-s ours) am a0aa64ac: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '33dd2835321caf885f4468c394b5bc32b76957a9':
  Import translations. DO NOT MERGE
2013-10-14 11:28:26 -07:00
Dirk Dougherty
7b22ed2366 am 50260360: am 86858479: am 00c5db05: Merge "Doc change: fix link to widgets design doc." into klp-dev
* commit '50260360f43880e600ac8518644e842e6731f105':
  Doc change: fix link to widgets design doc.
2013-10-14 11:28:21 -07:00
Daniel Sandler
df36aad119 am 3393e58d: am 54d83daa: am 19e8273b: Merge "Don\'t show [!] battery at boot." into klp-dev
* commit '3393e58d0340b47ab61c216b478cf78a41e93e88':
  Don't show [!] battery at boot.
2013-10-14 11:28:14 -07:00
Daniel Sandler
245f8a9501 resolved conflicts for merge of 5fa473cd to master
Change-Id: I097ac206c5232b0596d9d81baad3a501492335ca
2013-10-14 14:25:26 -04:00
Scott Main
9006c42290 more documentation for SEND_RESPOND_VIA_MESSAGE
Change-Id: I51ffd122a99481694088d84d46a50752c4c07a48
2013-10-14 11:19:53 -07:00
Winson Chung
0b7ba07dfb am c07f048d: am 4a913455: am 00f597bc: Adding additional MNC overlays. (Bug 10518893)
* commit 'c07f048dec39658d614a8cbe741e71f264262a04':
  Adding additional MNC overlays. (Bug 10518893)
2013-10-14 10:53:25 -07:00
Craig Mautner
edda7e4cdb am 10caa3b8: am d3b2fa49: am e1db0dd0: Test for task in front must include stack in front.
* commit '10caa3b8b1181d3dc77870487ae031a7d59f70f7':
  Test for task in front must include stack in front.
2013-10-14 10:53:11 -07:00
Adam Powell
d33c97e2de am 5d96f61a: am c12f46eb: am 5db566f1: Fix updating fast scroll state for data set changes
* commit '5d96f61a92de034cb736fa831067759809ca83f9':
  Fix updating fast scroll state for data set changes
2013-10-14 10:53:07 -07:00
Craig Mautner
4a39a8319a am 59cd8d70: am 5ab73bec: am 4ebe5780: Merge "Revert "Restore wallpaper positioning between apps."" into klp-dev
* commit '59cd8d70dcc53591e448a25eafea6d1eb4cc5067':
  Revert "Restore wallpaper positioning between apps."
2013-10-14 10:53:01 -07:00
Jim Miller
53e711fff6 am 7c4f3b81: am a55feec8: am f89ff85f: Merge "Hide the camera and search icons when switching to the camera page" into klp-dev
* commit '7c4f3b8134c9fa4403d070161930623efa9ac577':
  Hide the camera and search icons when switching to the camera page
2013-10-14 10:52:52 -07:00
Jim Miller
f6dd090d98 am 91feb766: am 43b0ce62: am 05da3280: Merge "Fix warp animation in keyguard" into klp-dev
* commit '91feb766f9b1f121611d26931e6cd65e46ddfd01':
  Fix warp animation in keyguard
2013-10-14 10:52:48 -07:00
John Spurlock
8c001353d7 am af97c1fc: am 5ca56cb9: am 1ae1373a: Merge "Wire up new hideycling ok button to persist setting." into klp-dev
* commit 'af97c1fc9c81d64e8576a47f27e9d8627d1cb60a':
  Wire up new hideycling ok button to persist setting.
2013-10-14 10:52:44 -07:00
Dianne Hackborn
9d343c2606 am f2896e28: am 9e4403d4: am ef53fcc3: Merge "Fix issue #11199654: Action bar enter animation skips frames when cleared by the system" into klp-dev
* commit 'f2896e2897cace31d82d917f73b787a9d87b21cb':
  Fix issue #11199654: Action bar enter animation skips frames when cleared by the system
2013-10-14 10:52:33 -07:00
Jim Miller
e23ced5ecc am 51171688: am 7f210cbb: am 103a734b: Merge "Fix bug where lockout timeout is shown for SIM in keyguard" into klp-dev
* commit '51171688154947124fe8868cdcd43fbbe4fff495':
  Fix bug where lockout timeout is shown for SIM in keyguard
2013-10-14 10:52:29 -07:00
Jim Miller
11ea370b79 am 8360bde1: am d04244d4: am 7fa498bf: Merge "Disable the camera and search buttons while we\'re in bouncer mode." into klp-dev
* commit '8360bde120e71389cc3b7a436a95e0e5a4e98bca':
  Disable the camera and search buttons while we're in bouncer mode.
2013-10-14 10:52:24 -07:00
Vineeta Srivastava
824fb6714f am 9d325d33: am b2fc8791: am 158aeaf0: Merge "telephony: redirect call barring MMI code to other purpose" into klp-dev
* commit '9d325d3339067e0a4898a61a1677460d32231cfe':
  telephony: redirect call barring MMI code to other purpose
2013-10-14 10:52:21 -07:00
Aravind Akella
45484ee6bb am 67af9ce3: am c73810de: am 45ca531e: Merge "Adding stepcounter & stepdetector feature strings." into klp-dev
* commit '67af9ce31e7642ffc5737b9c29812c4bfdf789e0':
  Adding stepcounter & stepdetector feature strings.
2013-10-14 10:52:15 -07:00
John Spurlock
91d13d9e3a am d428d643: am 45d41eba: am f732e37c: Merge "If the panels are disabled, don\'t go opaque on interaction." into klp-dev
* commit 'd428d64387478eb2bd8773450934e53ef3ed11b0':
  If the panels are disabled, don't go opaque on interaction.
2013-10-14 10:52:07 -07:00
Victoria Lease
04e44f3b30 am 7831fd2f: am 7d3fb2d6: am 881e1a6b: Merge "do not request location from unavailable providers" into klp-dev
* commit '7831fd2fdb46572025195b4b8ec6f1f5b3d9b8c6':
  do not request location from unavailable providers
2013-10-14 10:52:04 -07:00
Adam Powell
161b157b87 am 6a564f96: am 7555372f: am 85e5ed63: Merge "Account for translationY when targeting the fast scroller via touch" into klp-dev
* commit '6a564f961675e8dd6b1a518a5c82555d616b3d04':
  Account for translationY when targeting the fast scroller via touch
2013-10-14 10:52:00 -07:00
Jim Miller
1398e8944f am c57b9430: am 0cdab579: am 39eaeb99: Merge "Update clock to use 14dp instead of 12dp for status info." into klp-dev
* commit 'c57b9430444683654eb45ac93df6df2e9a36e09f':
  Update clock to use 14dp instead of 12dp for status info.
2013-10-14 10:51:57 -07:00
Daniel Sandler
1093a85a29 am 0b6b0992: am 71352415: am ce6d9066: Merge "New window cling for immersive mode." into klp-dev
* commit '0b6b09929996f7b76210bedab281b93581af96ba':
  New window cling for immersive mode.
2013-10-14 10:51:52 -07:00
Daniel Sandler
3670316db6 am 58346d21: am 816fdb03: am e00ab019: Merge "Easter egg cleanups." into klp-dev
* commit '58346d212a3b48f4f965e4bf40baad1953330b03':
  Easter egg cleanups.
2013-10-14 10:51:48 -07:00