OSDN Git Service
Jason Monk [Thu, 3 Sep 2015 17:51:09 +0000 (17:51 +0000)]
Merge "Start tether service with redeliver intent" into mnc-dr-dev
Jason Monk [Thu, 3 Sep 2015 16:48:25 +0000 (12:48 -0400)]
Start tether service with redeliver intent
So that the intent comes back when we are restarted rather than
null causing a crash.
Bug:
23678853
Change-Id: I1697159d5557feb7a87b238f8efa99ed3142fe6a
Jorim Jaggi [Thu, 3 Sep 2015 01:19:28 +0000 (01:19 +0000)]
Merge "Fix fingerprint settings ripples" into mnc-dr-dev
Jorim Jaggi [Thu, 3 Sep 2015 00:24:55 +0000 (17:24 -0700)]
Fix fingerprint settings ripples
Bug:
22471044
Bug:
23234027
Change-Id: If74a133f33c9cc72cb9ff6ccce32458d7300ae07
Maurice Lam [Wed, 2 Sep 2015 23:35:15 +0000 (23:35 +0000)]
Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
Maurice Lam [Wed, 2 Sep 2015 21:36:19 +0000 (14:36 -0700)]
[Fingerprint] Update strings for skip dialog
Bug:
23228889
Change-Id: I6c85dccbda2b5c0ad44ac72ca4107f9dcbb6a1b5
Sungmin Choi [Fri, 31 Jul 2015 09:03:52 +0000 (02:03 -0700)]
To hide none security option, use config_hide_none_security_option config
Use mcc config overlay mechanism to hide none security option
in countries where it is mandatory.
To hide none security option, set config_hide_none_security_option config
true as mcc config overlay.
Bug:
22209425
Bug:
22975388
Change-Id: I774c53e17d3b50393816622134e58f8e06b76fab
Geoff Mendal [Wed, 2 Sep 2015 14:05:31 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9f2e39d6875f3f3d6b4eab8c3c29a0155c69d6ce
Auto-generated-cl: translation import
Xiyuan Xia [Tue, 1 Sep 2015 20:29:41 +0000 (20:29 +0000)]
Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev
Jason Monk [Tue, 1 Sep 2015 19:02:44 +0000 (19:02 +0000)]
Merge "Protect against multiple provision responses" into mnc-dr-dev
Xiyuan Xia [Tue, 1 Sep 2015 18:46:19 +0000 (18:46 +0000)]
Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev
Xiyuan Xia [Tue, 1 Sep 2015 18:29:36 +0000 (11:29 -0700)]
Fix wrong stage exception in ChooseLockPattern
ChooseLockPattern should updateStage instead of always enabling
pattern view input.
Bug:
22760251
Change-Id: I3675c0aada293e168769147ba8e4203e9310e593
Jason Monk [Tue, 1 Sep 2015 17:20:55 +0000 (13:20 -0400)]
Protect against multiple provision responses
Bug:
23573004
Change-Id: I9cbc7574d2019244f7198784372ce68d7e4d1fa2
Xiyuan Xia [Mon, 31 Aug 2015 18:59:46 +0000 (11:59 -0700)]
Fix races in ConfirmPassword/Pattern
- Add a CheckLockResultTracker to track result of async lock check so that
it can finish on configuration change;
- Let the pending lock check finish and ignore subsequent check requests;
- Add a mDisappearing flag to prevent running disappear animation
multiple times;
- Check whether activity is still active after disappear animation
before setting result and finishing it;
- Remove no longer used mNumWrongConfirmAttempts;
Bug:
23190499
Change-Id: If1784d3d1fcc152ac06137b12748b9def5726692
Geoff Mendal [Mon, 31 Aug 2015 14:07:58 +0000 (07:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id58b50a01ad4217ad851dd8aed6a53b39ce3d426
Auto-generated-cl: translation import
Geoff Mendal [Sat, 29 Aug 2015 15:38:50 +0000 (08:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idee4ab4cd6915f02efac37f747640077a33cb75a
Auto-generated-cl: translation import
Maurice Lam [Fri, 28 Aug 2015 22:13:19 +0000 (22:13 +0000)]
Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
Maurice Lam [Fri, 28 Aug 2015 04:28:23 +0000 (21:28 -0700)]
[Fingerprint] Add skip dialog during SUW
During setup wizard, add a skip dialog to confirm whether the user
wants to skip fingerprint setup or not.
Bug:
23228889
Change-Id: I2c1c26522b085e722e7bd7b34a26d2a38412bee4
Geoff Mendal [Fri, 28 Aug 2015 10:14:49 +0000 (10:14 +0000)]
am
37dfaa13: (-s ours) Import translations. DO NOT MERGE
* commit '
37dfaa13ec6882720ca100ef235a7649046aec12':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 28 Aug 2015 10:06:04 +0000 (03:06 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
23544168
Change-Id: Iade81d81334be9289e7381f05931257154f72a6f
Geoff Mendal [Fri, 28 Aug 2015 10:02:07 +0000 (03:02 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
23544168
Change-Id: I39c268e990f8cbb57fef7cec1a9a36ddac45f968
Xiyuan Xia [Fri, 28 Aug 2015 01:46:57 +0000 (01:46 +0000)]
Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev
Xiyuan Xia [Tue, 25 Aug 2015 22:04:57 +0000 (15:04 -0700)]
Fix ChoosePat/Pin/Pwd crash from async task
Use a retained worker fragment to track the asynchronous
save-and-finish task so that ChoosePattern/Password activity
is properly dismissed after a configuration change.
Bug:
23424884
Bug:
23521530
Change-Id: I328022c1603cfb0f6812cd8aa7916ae7b72c9950
Geoff Mendal [Wed, 26 Aug 2015 14:12:08 +0000 (07:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1d08cdfb6ad7723d4e0bd578b0b699fc9d2389db
Auto-generated-cl: translation import
Jim Miller [Tue, 25 Aug 2015 23:08:55 +0000 (23:08 +0000)]
Merge "Don't attempt to remove fp templates if none are enrolled" into mnc-dr-dev
Sanket Padawe [Mon, 24 Aug 2015 17:59:07 +0000 (17:59 +0000)]
am
3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
* commit '
3be6d0b44bf1152be0bc11bf6bacf750e1028b49':
Avoid new network to connect by using "Add Network" instead only Save it.
Sanket Padawe [Mon, 24 Aug 2015 17:52:51 +0000 (17:52 +0000)]
Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
Geoff Mendal [Mon, 24 Aug 2015 14:16:24 +0000 (07:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I14e14a1e5f548b559939584de4a209990318f799
Auto-generated-cl: translation import
Jim Miller [Sat, 22 Aug 2015 01:07:50 +0000 (18:07 -0700)]
Don't attempt to remove fp templates if none are enrolled
The code was blindly calling fpm.remove(0) to remove all
fingerprint templates and then waiting for them to be removed.
Fixes bug
23183484
Change-Id: Ie510097d85bba32d965ba3c7f324f6c042e08300
Sanket Padawe [Fri, 21 Aug 2015 23:45:30 +0000 (16:45 -0700)]
Avoid new network to connect by using "Add Network" instead only Save it.
Bug:
23422433
Change-Id: I49aabff91ba127bf2a3b0aa25c8163ee4097bf4d
Christopher Tate [Fri, 21 Aug 2015 19:26:07 +0000 (19:26 +0000)]
am
ffe701dc: Present the security patch date in a human-friendly format
* commit '
ffe701dc0e52ee95bf6c54291ed1b574d389019c':
Present the security patch date in a human-friendly format
Christopher Tate [Thu, 20 Aug 2015 23:38:37 +0000 (16:38 -0700)]
Present the security patch date in a human-friendly format
For example, for an ISO date of 2015-08-01, this now displays
"August 1, 2015" in enUS, and "1 August 2015" in enUK, and
"2015年8月1日" in jpJP.
Bug
23358065
Change-Id: Iaa920ec88d765a222f0b589123665b689bf41978
Selim Cinek [Thu, 20 Aug 2015 19:04:30 +0000 (19:04 +0000)]
am
19551115: Adapted string length translation limits
* commit '
19551115dbb3d848be084462342d41addeb1caf6':
Adapted string length translation limits
Selim Cinek [Thu, 20 Aug 2015 18:53:47 +0000 (11:53 -0700)]
Adapted string length translation limits
Bug:
23298302
Change-Id: Id7651b28bab6e4ff37e94b30d68509ae959c6d70
Maurice Lam [Wed, 19 Aug 2015 23:51:30 +0000 (23:51 +0000)]
Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
Geoff Mendal [Wed, 19 Aug 2015 14:09:16 +0000 (14:09 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 19 Aug 2015 14:08:00 +0000 (07:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9ab62b9e28b5dd6f8cd2a54e1ae7e015b8730e03
Auto-generated-cl: translation import
Maurice Lam [Wed, 19 Aug 2015 01:30:36 +0000 (18:30 -0700)]
[Fingerprint] Smaller enrolling ring
Make the enrolling progress ring smaller in sw400dp during setup.
Bug:
23216520
Change-Id: I01a862baf9ea3e75e2164d12b7ef13dee5f28c5a
Paul Lawrence [Wed, 12 Aug 2015 20:49:34 +0000 (13:49 -0700)]
Stop crash on repeated enters on virtual keyboard
Change https://googleplex-android-review.git.corp.google.com/#/c/742462/
removed the mDone since graying out the button seemed to remove the need
for this. However, you can also enter this command repeatedly from the
soft keyboard.
Put mDone back.
Bug:
23181625
Change-Id: I42e8ecb9824b17825778c9c113130506cc3a200b
Julia Reynolds [Mon, 17 Aug 2015 17:26:19 +0000 (17:26 +0000)]
am
0ece6a32: String update for battery details page.
* commit '
0ece6a3241062842db991ad63add899369ce1853':
String update for battery details page.
Julia Reynolds [Mon, 17 Aug 2015 17:14:38 +0000 (13:14 -0400)]
String update for battery details page.
Bug:
22978210
Change-Id: I87d231868d6116c3f0d88a6a6d3ca5fac1ce8c90
Chris Wren [Mon, 17 Aug 2015 16:47:56 +0000 (16:47 +0000)]
Merge "instrument fingerprint settings" into mnc-dr-dev
Jason Monk [Mon, 17 Aug 2015 15:29:52 +0000 (15:29 +0000)]
Merge "Fix Usb-C dialog issues" into mnc-dr-dev
Geoff Mendal [Mon, 17 Aug 2015 14:05:00 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic048bcec759963a76125600eb86b952a2aec5759
Auto-generated-cl: translation import
Chris Wren [Fri, 14 Aug 2015 19:42:02 +0000 (15:42 -0400)]
instrument fingerprint settings
instrument visibility on all fingerprint views
rename and delete action
add fingerprint action is implicit in flow
Bug:
22951001
Change-Id: I53f048f479e24754972b801598d5da393ba9d716
Adam Lesinski [Fri, 14 Aug 2015 19:43:40 +0000 (19:43 +0000)]
am
3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
* commit '
3cc05c9d7e290b7e6ff10c3428c471b8e2529f2c':
BatteryStats: Fix coalescing of shared app GIDs and system UIDs
Adam Lesinski [Fri, 14 Aug 2015 19:38:34 +0000 (19:38 +0000)]
Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
Jeff Sharkey [Fri, 14 Aug 2015 18:29:15 +0000 (18:29 +0000)]
am
b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
* commit '
b4158f0e15bdc55de40a4e5f5a17c9e4a6325b61':
Only offer migration between private volumes.
Jeff Sharkey [Fri, 14 Aug 2015 18:23:39 +0000 (18:23 +0000)]
Merge "Only offer migration between private volumes." into mnc-dev
Chris Tate [Fri, 14 Aug 2015 17:20:18 +0000 (17:20 +0000)]
am
7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '
7e36d33c00458a5f74b69963723c6e06f3f6ccf3':
Make "Ask every time" actually work that way
Chris Tate [Fri, 14 Aug 2015 17:11:48 +0000 (17:11 +0000)]
Merge "Make "Ask every time" actually work that way" into mnc-dev
Jeff Sharkey [Fri, 14 Aug 2015 16:46:03 +0000 (09:46 -0700)]
Only offer migration between private volumes.
Without this change, there is a confusing option to migrate a public
SD card volume to internal storage, which will always fail if the
user picks it, since it's not supported under the hood.
Bug:
22966671
Change-Id: Id7cad07eea6583aace398a6d64383bf7d884ae9e
Adam Lesinski [Thu, 13 Aug 2015 23:56:30 +0000 (16:56 -0700)]
BatteryStats: Fix coalescing of shared app GIDs and system UIDs
UIDs that consumed power and were actually shared app GIDs are now
coelsced for system apps as well as regular applications. In addition,
system UIDs like logd, NFC, DRM, etc are coalesced into Android System.
Bug:
23189342
Change-Id: I6c8eb4baec66fba3d1f71a155d8ea1fe920ffec9
Jeff Sharkey [Fri, 14 Aug 2015 01:24:41 +0000 (01:24 +0000)]
am
ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
* commit '
ae531f1f613fb1a94fade18e5e92fc842a2a9016':
Show storage slow dialog allowing state loss.
Jeff Sharkey [Fri, 14 Aug 2015 01:18:18 +0000 (01:18 +0000)]
Merge "Show storage slow dialog allowing state loss." into mnc-dev
Jeff Sharkey [Thu, 13 Aug 2015 23:57:46 +0000 (16:57 -0700)]
Show storage slow dialog allowing state loss.
We're not picky about losing state here, since the adoption actually
finished under the hood and we're just warning the user that it's
slow.
Without this change, we could end up throwing and re-adopting the
same device twice, which causes issues on sprout-style devices that
only migrate primary storage once.
Bug:
22867250
Change-Id: I1491679ab802f19fe25b82e9b452ca3dabdfec0d
Christopher Tate [Thu, 13 Aug 2015 23:34:10 +0000 (16:34 -0700)]
Make "Ask every time" actually work that way
..in link-opening behavior. If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.
Bug
23147746
Change-Id: I73d8893ab74ea0356b757ab836349243cda2e307
Geoff Mendal [Thu, 13 Aug 2015 04:59:17 +0000 (04:59 +0000)]
am
eea96f22: (-s ours) Import translations. DO NOT MERGE
* commit '
eea96f22a1ec156d78374f49352341c46c219ca0':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 13 Aug 2015 04:50:09 +0000 (21:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
23037720
Change-Id: I2349611e7f02b8e06ac12a4c86573711c6ff6a0e
Jorim Jaggi [Thu, 13 Aug 2015 01:18:03 +0000 (01:18 +0000)]
Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
Jorim Jaggi [Tue, 11 Aug 2015 01:11:07 +0000 (18:11 -0700)]
Wait with finishing until fingerprints are removed
Bug:
22863210
Change-Id: I490157cc2f9b52ac87cc52e13c7eb57cb4a4a377
Dianne Hackborn [Thu, 13 Aug 2015 00:54:31 +0000 (00:54 +0000)]
am
f67d0785: Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
* commit '
f67d0785d006677d2fba3f2192f3f6ea824c5336':
Fix issue #
23116383: Include security patch level in Settings
Dianne Hackborn [Thu, 13 Aug 2015 00:46:58 +0000 (00:46 +0000)]
Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
Dianne Hackborn [Wed, 12 Aug 2015 23:11:46 +0000 (16:11 -0700)]
Fix issue #
23116383: Include security patch level in Settings
Change-Id: I003564376a02a70f0245353472544cde355240ac
Jason Monk [Wed, 12 Aug 2015 18:14:33 +0000 (14:14 -0400)]
Fix Usb-C dialog issues
- Fix theme
- Fix PTP bug introduced in initial USB-C support
Bug:
21615151
Change-Id: I577f06929b028fe3f50ef5b9adcfa9507fd1df0e
Sanket Padawe [Wed, 12 Aug 2015 17:17:31 +0000 (17:17 +0000)]
Merge "Avoid sending identity along with EAP sim, aka & aka'." into mnc-dr-dev
Geoff Mendal [Wed, 12 Aug 2015 14:00:45 +0000 (07:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id1b064096c8580892f747af1c02e46ad5b897671
Auto-generated-cl: translation import
Sanket Padawe [Wed, 12 Aug 2015 01:42:36 +0000 (18:42 -0700)]
Avoid sending identity along with EAP sim, aka & aka'.
Bug:
22358498
Change-Id: I829b3f9fe688efc933483506e1b5944195e1975f
Andres Morales [Tue, 11 Aug 2015 23:35:59 +0000 (23:35 +0000)]
am
9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
* commit '
9f879ef009863a0674e891ad0e51b1b216da5beb':
[ConfirmPattern] use correct user id for stealth mode
Andres Morales [Tue, 11 Aug 2015 23:31:23 +0000 (23:31 +0000)]
Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
Dianne Hackborn [Tue, 11 Aug 2015 23:26:45 +0000 (23:26 +0000)]
am
8500822b: Merge "Fix issue #
23079119: Description for write settings permission says..." into mnc-dev
* commit '
8500822b8e39473e272a0c4e84349aa9dadf763f':
Fix issue #
23079119: Description for write settings permission says...
Dianne Hackborn [Tue, 11 Aug 2015 23:17:24 +0000 (23:17 +0000)]
Merge "Fix issue #
23079119: Description for write settings permission says..." into mnc-dev
Andres Morales [Tue, 11 Aug 2015 23:12:50 +0000 (16:12 -0700)]
[ConfirmPattern] use correct user id for stealth mode
Bug:
23027554
Change-Id: I9582dab3a0355f613d0ce1c943b0eeba2694dddd
Maurice Lam [Tue, 11 Aug 2015 22:43:35 +0000 (22:43 +0000)]
am
3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
* commit '
3d9cb9261849d8178ce834c8216fe2154db4e5af':
[Fingerprint] Use different ring size for setup
Maurice Lam [Tue, 11 Aug 2015 22:35:53 +0000 (22:35 +0000)]
Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
Paul Lawrence [Tue, 11 Aug 2015 22:20:53 +0000 (22:20 +0000)]
Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev
Paul Lawrence [Mon, 3 Aug 2015 16:44:23 +0000 (09:44 -0700)]
Gray out confirm button on pattern/pin/password set dialog
Setting a pin/pattern/password can take a second. Gray out the confirm
button to avoid multiple submissions.
Note that this requires async tasks so that the button is shown as gray
in a timely way.
Also don't add another stage - this causes a11y to repeat the title.
Bug:
22882174
Change-Id: Ib8047fde9e12afa25e82ebfa3a1e799a4b7043f2
Dianne Hackborn [Tue, 11 Aug 2015 19:17:59 +0000 (12:17 -0700)]
Fix issue #
23079119: Description for write settings permission says...
...it is for read and write
Just write.
And let's say, modify.
Change-Id: If901bab36888674d5a6e8c5979ec190b64aff18e
Jason Monk [Tue, 11 Aug 2015 13:55:54 +0000 (13:55 +0000)]
Merge "Add setting to disable camera gesture" into mnc-dr-dev
Dianne Hackborn [Tue, 11 Aug 2015 00:19:40 +0000 (00:19 +0000)]
am
be4df036: Fix issue #
23037899: Support for Battery Optimization permission + Dialog
* commit '
be4df036e1c688a1b7a5fc9d4ab18f09729296b3':
Fix issue #
23037899: Support for Battery Optimization permission + Dialog
Dianne Hackborn [Tue, 11 Aug 2015 00:11:09 +0000 (00:11 +0000)]
am
ba38155d: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
ba38155d257aa00e0dabb9cf9eefc1a281278a14':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Mon, 10 Aug 2015 21:53:33 +0000 (14:53 -0700)]
Fix issue #
23037899: Support for Battery Optimization permission + Dialog
New pretty dialog.
Change-Id: I6094b83139beffc407b01049a0d9d1f85a95df07
Dianne Hackborn [Tue, 11 Aug 2015 00:06:43 +0000 (00:06 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
Dianne Hackborn [Tue, 11 Aug 2015 00:03:38 +0000 (17:03 -0700)]
Fix issue #
23037720: New Battery Optimization Strings
No, really, these are the strings.
Change-Id: Ibe94b5251934a1d855974d846f3de6bdb314c7e9
Dianne Hackborn [Mon, 10 Aug 2015 22:02:23 +0000 (22:02 +0000)]
am
996e285c: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
996e285cdcd26ee7251ec80915eeed57541efb6d':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Mon, 10 Aug 2015 21:55:23 +0000 (21:55 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
Julia Reynolds [Mon, 10 Aug 2015 20:37:34 +0000 (20:37 +0000)]
am
2557d8a2: Merge "Wrap text on long preferences." into mnc-dev
* commit '
2557d8a25124b93801bc5de1b1b2d063cad1c3ff':
Wrap text on long preferences.
Julia Reynolds [Mon, 10 Aug 2015 20:32:49 +0000 (20:32 +0000)]
Merge "Wrap text on long preferences." into mnc-dev
Jason Monk [Mon, 10 Aug 2015 20:14:46 +0000 (20:14 +0000)]
am
cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev
* commit '
cf1e22f4471f39f4cf3c134006ecf9ffedb91e36':
Remove extra help & feedback menu from power usage
Jason Monk [Mon, 10 Aug 2015 20:09:20 +0000 (20:09 +0000)]
Merge "Remove extra help & feedback menu from power usage" into mnc-dev
Jason Monk [Mon, 10 Aug 2015 19:58:09 +0000 (15:58 -0400)]
Remove extra help & feedback menu from power usage
Bug:
23044354
Change-Id: Ic722655a50eddbf4f8e53a2b73ed49b5cf6426a4
Pavel Zhamaitsiak [Mon, 10 Aug 2015 17:35:16 +0000 (17:35 +0000)]
am
8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev
* commit '
8cf54264995aea65d77c25b5050cb3aac0196c59':
Ensure that listener is removed only if it was added
Pavel Zhamaitsiak [Mon, 10 Aug 2015 17:29:38 +0000 (17:29 +0000)]
Merge "Ensure that listener is removed only if it was added" into mnc-dev
Geoff Mendal [Mon, 10 Aug 2015 14:03:46 +0000 (07:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: If91d4ed788fe61f16f68cdc2fb8c1d1a6ca39721
Auto-generated-cl: translation import
Geoff Mendal [Sat, 8 Aug 2015 14:26:58 +0000 (07:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I49911941b08daff0dce1d0ec3ca9b21ae209650b
Auto-generated-cl: translation import
Jeff Sharkey [Fri, 7 Aug 2015 23:51:57 +0000 (23:51 +0000)]
am
67f0739c: Merge "Block moving when already in progress." into mnc-dev
* commit '
67f0739ca3a81515975856b09d216debfd090ae9':
Block moving when already in progress.
Jeff Sharkey [Fri, 7 Aug 2015 23:38:44 +0000 (23:38 +0000)]
Merge "Block moving when already in progress." into mnc-dev
Jeff Sharkey [Fri, 7 Aug 2015 22:59:28 +0000 (15:59 -0700)]
Block moving when already in progress.
Use frozen state as a proxy for knowing if a package is currently
being moved, and block any new move requests until the current move
is finished.
Bug:
22069486
Change-Id: I50a70353132c1035b969982f0b7779f5dcb2251d
Billy Lau [Fri, 7 Aug 2015 22:22:19 +0000 (22:22 +0000)]
am
a59f39fc: Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
* commit '
a59f39fca65d0828b0e4ade95a8404282e858ba9':
Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
Billy Lau [Fri, 7 Aug 2015 22:15:32 +0000 (22:15 +0000)]
Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev