15585 Commits

Author SHA1 Message Date
Ben Kwa
efb70fd8a0 Merge "Cherry pick beefed-up error handling in the CopyService from master. DO NOT MERGE" into mnc-dev 2015-05-05 18:54:07 +00:00
Tony Mantler
def4c0c49a Merge "Don't crash in StorageMeasurement if volume isn't mounted" into mnc-dev 2015-05-05 17:59:01 +00:00
Casper Bonde
424681e43e Settings UI for SIM access profile (2/2)
Change-Id: I2e44a858ee3f3349baa401ee7002186d3ae19412
2015-05-05 16:59:24 +00:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
2015-05-05 01:06:38 +00:00
Jorim Jaggi
76511c75e6 Update emergency call button label when language changes
Bug: 17987231
Change-Id: I74fe6942f4ff965537803d61f3446d5f28a60f9e
2015-05-04 23:46:56 +00:00
Jorim Jaggi
9f74303eb8 Track unlock attempts per user.
Bug: 19330825
Change-Id: I3e09f676b945dbeee16dc0fb3cb126cb884a6934
2015-05-04 23:44:15 +00:00
Chris Wren
0425de31cf Merge "eliminate notification clicker garbage." into mnc-dev 2015-05-04 21:06:17 +00:00
Chris Wren
42d5dd4690 eliminate notification clicker garbage.
Bug: 9739772
Change-Id: If05079cb0f956e03f26c7780c318452f73c3e849
2015-05-04 17:03:48 -04:00
Sanket Padawe
5c33a2e3ec Merge "Adding "Connected, no Internet" string in Wifi nw summary." into mnc-dev 2015-05-04 20:44:52 +00:00
Ben Kwa
c7a01cfe15 Cherry pick beefed-up error handling in the CopyService from master. DO NOT MERGE
Send copy errors to the destination provider.
Big overhaul of tests to make them simpler.
Test that errors during copying are detected and partial copies are
cleaned up.
Test that copying empty directories works properly.

Change-Id: I3fe0e73bdc92c2b6f522857ca5631f6d03d5a666
(cherry picked from commit dae8c378d6c680ae9efa8e1202d9bc92fb0dfb11)
2015-05-04 20:28:44 +00:00
Tony Mantler
ca2954830c Don't crash in StorageMeasurement if volume isn't mounted
Change-Id: I3f5d62c93b0bb95bec358a33e1a4497f1b55f8ad
2015-05-04 10:57:44 -07:00
Steve McKay
5d2c1d54b9 Merge "Ensure sort menu is shown as needed." into mnc-dev 2015-05-04 16:22:43 +00:00
Steve McKay
69aee097a3 Ensure sort menu is shown as needed.
This also hoists common code for options menu setup into BaseActivity.

Change-Id: Ie87b8188a6c142b2312c92dc0d0bd550f0b1e59f
2015-05-04 16:21:09 +00:00
Andrew Flynn
ae499d19eb Merge "SystemUI Carrier Network Change unit tests" into mnc-dev 2015-05-04 14:43:20 +00:00
Andrew Flynn
5e75147806 SystemUI Carrier Network Change unit tests
- Includes unit tests for verifying mobile data indicators.
- Found one bug where dark mode icon wasn't showing properly when
  different from light mode icon.
- Comment out failing test
  NetworkControllerSignalTest#testSetCurrentSubscriptions

Bug: 20288155
Change-Id: Ib3c9ba224c4187cab35d6bfa68f6bd4c489cf98e
2015-05-04 10:25:09 -04:00
Geoff Mendal
3f2f2cbbd6 Import translations. DO NOT MERGE
Change-Id: I1ece3421339dabd55a0c586e9ffd961cf7e3de56
Auto-generated-cl: translation import
2015-05-04 07:11:09 -05:00
Lorenzo Colitti
0fdf7eee67 Merge "Add a status bar icon for Ethernet." into mnc-dev 2015-05-04 01:01:51 +00:00
Matthew Williams
303650c9cd Add full backup criteria to android manifest
BUG: 20010079
Api change: ApplicationInfo now has a fullBackupContent int
where -1 is (off) 0 is (on) and >0 indicates an xml
resource that should be parsed in order for a developer
to indicate exactly which files they want to include/exclude
from the backup set.
dd: https://docs.google.com/document/d/1dnNctwhWOI-_qtZ7I3iNRtrbShmERj2GFTzwV4xXtOk/edit#heading=h.wcfw1q2pbmae

Change-Id: I90273dc0aef5e9a3230c6b074a45e8f5409ed5ce
2015-05-03 16:19:27 -07:00
Geoff Mendal
480798d878 Import translations. DO NOT MERGE
Change-Id: I982c3b51da747b06c157c947ca441dc641acb5d5
Auto-generated-cl: translation import
2015-05-01 23:16:15 -05:00
Lorenzo Colitti
d46bb58fa6 Add a status bar icon for Ethernet.
Bug: 20613953
Change-Id: I52970b4f5fb6429876d1a2eb195a834c9e020021
2015-05-02 10:43:31 +09:00
Sanket Padawe
7094d22022 Adding "Connected, no Internet" string in Wifi nw summary.
Bug: 17380953
Change-Id: I9664bcbf33832fe722e7d2b3125939287ee98098
2015-05-01 16:55:00 -07:00
Fabrice Di Meglio
4eb03f8fd2 Merge "Remove obsolete code for App Links IntentFilterVerifier" into mnc-dev 2015-05-01 21:25:30 +00:00
Fabrice Di Meglio
7d7094fd2b Remove obsolete code for App Links IntentFilterVerifier
- the intent filter verification is now done by the StatementService

See bug #20759587

Change-Id: Icee668819feffc282b3986873c9d13abbe03e92b
2015-05-01 14:24:02 -07:00
Jorim Jaggi
0629a5d524 Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev 2015-05-01 20:34:22 +00:00
Jorim Jaggi
5f560d0562 Rename supportsAssistGesture to supportsAssist
Bug: 20642759
Change-Id: Idddc786980244cc94570d04fd414540bbad60448
2015-05-01 13:33:38 -07:00
Chris Wren
b1ad8e9ea0 Merge changes from topic 'tron' into mnc-dev
* changes:
  remove unused edge border dimension.
  log clear all button
2015-05-01 18:46:42 +00:00
Benjamin Franz
a7cba44a22 Merge "Improve Accessibility behaviour in recents" into mnc-dev 2015-05-01 17:56:18 +00:00
Chris Wren
9c4ba332e9 remove unused edge border dimension.
Change-Id: I9f763aa130b76179d98288601f023038f086756b
2015-05-01 11:09:39 -04:00
Chris Wren
9763d42c7b log clear all button
Bug: 20089768
Change-Id: I96d64c387b6085025df76c4aaf7ff9d7bdf51799
2015-05-01 11:09:26 -04:00
John Spurlock
1694c4ed65 am 7ea13e85: am e08e3940: am 24ea865f: Merge "Volume l10n: Increase charlimits on zen submode strings." into mnc-dev
* commit '7ea13e85b3e6b40992a919c40f6cf52569124679':
  Volume l10n: Increase charlimits on zen submode strings.
2015-04-30 19:13:14 +00:00
John Spurlock
e08e39402c am 24ea865f: Merge "Volume l10n: Increase charlimits on zen submode strings." into mnc-dev
* commit '24ea865f0fd3b1ceafb3786bbed20ea345bc5cc0':
  Volume l10n: Increase charlimits on zen submode strings.
2015-04-30 18:40:20 +00:00
John Spurlock
24ea865f0f Merge "Volume l10n: Increase charlimits on zen submode strings." into mnc-dev 2015-04-30 18:31:59 +00:00
John Spurlock
f6ed7249cf Volume l10n: Increase charlimits on zen submode strings.
Bug: 20713756
Change-Id: Ib8f65997bfbd2c5a042bc02ff13ef9d5c8f90ecb
2015-04-30 14:29:33 -04:00
Robin Lee
644ff2f9d0 am ef25597a: SystemUI strings: prospective VPN strings for apps
* commit 'ef25597acfb15b1f4f501fbdcbafd1b6fa8cc9c6':
  SystemUI strings: prospective VPN strings for apps
2015-04-30 17:51:12 +00:00
Robin Lee
ef25597acf SystemUI strings: prospective VPN strings for apps
Bug: 20516964
Change-Id: Ifaeb388896145fd71ff9aa9fab6e2b04af807631
(cherry picked from commit 63539bd5fac53d90adff35df340562a1926d610e)
2015-04-30 17:38:29 +00:00
Robin Lee
7279af5969 Merge "SystemUI strings: prospective VPN strings for apps" 2015-04-30 17:38:16 +00:00
Robin Lee
63539bd5fa SystemUI strings: prospective VPN strings for apps
Bug: 20516964
Change-Id: Ifaeb388896145fd71ff9aa9fab6e2b04af807631
2015-04-30 18:37:15 +01:00
Benjamin Franz
b7a42fda31 Improve Accessibility behaviour in recents
Currently accessibility services use the activity label that is also
displayed in recents, which can be very confusing as it does not
represent necessarily represent the app that the recent item is
running. To improve this we use a combination of the application label
and the activity label. The application label is also badged to
distinguish between different users.

Bug: 19688800
Change-Id: Ibead6c87767649aa11cf2fe086924a4b69bf187c
2015-04-30 17:40:26 +01:00
Jeff Sharkey
15cbbd5e4b am 21a30889: am 1df4dca2: am 9e98dce6: Merge "Returning to wizard, split move events." into mnc-dev
* commit '21a30889485020bf885ca20e209ed85c6e7d4ea5':
  Returning to wizard, split move events.
2015-04-30 01:21:08 +00:00
Jeff Sharkey
1df4dca298 am 9e98dce6: Merge "Returning to wizard, split move events." into mnc-dev
* commit '9e98dce6ad7b4dd1ec4beda8a9af4ecd4efcf027':
  Returning to wizard, split move events.
2015-04-30 00:48:10 +00:00
Jeff Sharkey
50a0545479 Returning to wizard, split move events.
Finish wiring up notifications to jump back into in-progress wizard
flow, using moveId as identifier.

Split move events back into separate creation and progress events,
and pass details as bundle to pass extra stuff like UUID.  Null
package still means moving primary storage.

Add explicit "volume forgotten" event for PackageManager to clean
up internal state with.

Plumb through internal path reported by vold, and bring back FUSE
bypass rewriting optimization.

Bug: 19993667
Change-Id: I0f43edbba36c58c5cd33550022c54c4eb9f01a48
2015-04-29 17:24:12 -07:00
Vinit Deshpande
ad8aa59f70 am 8cc1d3db: Merge changes from topic \'PasspointUI\' into mnc-dev
* commit '8cc1d3dba4e06c47669c5b0c0d12b24ba70cd57a':
  Implement 'Available via Passpoint' feature [DO NOT MERGE]
  Fix settings UI for passpoint networks [DO NOT MERGE]
2015-04-30 00:02:18 +00:00
Vinit Deshpande
8cc1d3dba4 Merge changes from topic 'PasspointUI' into mnc-dev
* changes:
  Implement 'Available via Passpoint' feature [DO NOT MERGE]
  Fix settings UI for passpoint networks [DO NOT MERGE]
2015-04-29 23:51:59 +00:00
Vinit Deshpande
dcf00c9d0f Implement 'Available via Passpoint' feature [DO NOT MERGE]
This also fixes the issues related to explicit connection
to passpoint AP, and fixes occassional mention of
'connected via Wi-Fi Assistent'

Change-Id: I152cebafa6259194f1d09a6972a3508156335cb6
(cherry picked from commit ff783cd6cfc82870a6126fe1ef019d21131423fc)
2015-04-29 16:40:51 -07:00
John Spurlock
f26b6e46b0 am acaac2be: am 914967ab: am b351db72: Merge "Volume: dismiss volume UI to avoid HUNs." into mnc-dev
* commit 'acaac2be628266d0ac7fee158517bac17f10e85a':
  Volume: dismiss volume UI to avoid HUNs.
2015-04-29 23:39:41 +00:00
Vinit Deshpande
fc40600e30 Fix settings UI for passpoint networks [DO NOT MERGE]
This change includes showing the friendly name in saved
networks list and 'Connected via provider' addition for
passpoint connections.

Change-Id: If330baa96dedb099d5989b3df5b9778bbbcb15e3
(cherry picked from commit 597f49cdda63fef1b583e2053341485e8d4e2371)
2015-04-29 16:32:01 -07:00
John Spurlock
914967ab0c am b351db72: Merge "Volume: dismiss volume UI to avoid HUNs." into mnc-dev
* commit 'b351db7239ee1c0cb9561f92efc19d4e95eba367':
  Volume: dismiss volume UI to avoid HUNs.
2015-04-29 23:13:41 +00:00
John Spurlock
b351db7239 Merge "Volume: dismiss volume UI to avoid HUNs." into mnc-dev 2015-04-29 22:57:20 +00:00
John Spurlock
b349af5731 Volume: dismiss volume UI to avoid HUNs.
Also include headsUp in the name of the pinned callback
method.

Internal version of AOSP proposal:
  https://android-review.googlesource.com/147502

Change-Id: I8fe14bd7d65b2d3564cb1e2869d7ffbbac89e80d
2015-04-29 14:59:34 -04:00
Xiyuan Xia
0e0a1b1f3a am be850ed7: am ad3fcc02: am 19be9d31: Merge "Update bottom area alpha when stack height changes" into mnc-dev
* commit 'be850ed7e545b8b3deddccb529076179e7832a30':
  Update bottom area alpha when stack height changes
2015-04-29 16:22:56 +00:00