OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoMerge "Protect against multiple provision responses" 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

8 years agoMerge "Fix wrong stage exception in ChooseLockPattern" 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

8 years agoFix wrong stage exception in ChooseLockPattern
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

8 years agoProtect against multiple provision responses
Jason Monk [Tue, 1 Sep 2015 17:20:55 +0000 (13:20 -0400)]
Protect against multiple provision responses

Bug: 23573004
Change-Id: I9cbc7574d2019244f7198784372ce68d7e4d1fa2

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoMerge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
Maurice Lam [Fri, 28 Aug 2015 22:13:19 +0000 (22:13 +0000)]
Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev

8 years ago[Fingerprint] Add skip dialog during SUW
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

8 years agoam 37dfaa13: (-s ours) Import translations. DO NOT MERGE
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

8 years agoImport 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

8 years agoImport translations. DO NOT MERGE
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

8 years agoMerge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev
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

8 years agoFix ChoosePat/Pin/Pwd crash from async task
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoMerge "Don't attempt to remove fp templates if none are enrolled" into mnc-dr-dev
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

8 years agoam 3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only...
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.

8 years agoMerge "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

8 years agoImport translations. DO NOT MERGE
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

8 years agoDon't attempt to remove fp templates if none are enrolled
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

8 years agoAvoid new network to connect by using "Add Network" instead only Save it.
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

8 years agoam ffe701dc: Present the security patch date in a human-friendly format
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

8 years agoPresent 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

8 years agoam 19551115: Adapted string length translation limits
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

8 years agoAdapted 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

8 years agoMerge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
Maurice Lam [Wed, 19 Aug 2015 23:51:30 +0000 (23:51 +0000)]
Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev

8 years agoMerge "Import translations. DO NOT MERGE" 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

8 years agoImport translations. DO NOT MERGE
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

8 years ago[Fingerprint] Smaller enrolling ring
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

8 years agoStop crash on repeated enters on virtual keyboard
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

8 years agoam 0ece6a32: String update for battery details page.
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.

8 years agoString 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

8 years agoMerge "instrument fingerprint settings" into mnc-dr-dev
Chris Wren [Mon, 17 Aug 2015 16:47:56 +0000 (16:47 +0000)]
Merge "instrument fingerprint settings" into mnc-dr-dev

8 years agoMerge "Fix Usb-C dialog issues" 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

8 years agoImport translations. DO NOT MERGE
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

8 years agoinstrument fingerprint settings
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

8 years agoam 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs...
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

8 years agoMerge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
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

8 years agoam b4158f0e: Merge "Only offer migration between private volumes." 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.

8 years agoMerge "Only offer migration between private volumes." into mnc-dev
Jeff Sharkey [Fri, 14 Aug 2015 18:23:39 +0000 (18:23 +0000)]
Merge "Only offer migration between private volumes." into mnc-dev

8 years agoam 7e36d33c: Merge "Make "Ask every time" actually work that way" 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

8 years agoMerge "Make "Ask every time" actually work that way" into mnc-dev
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

8 years agoOnly offer migration between private volumes.
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

8 years agoBatteryStats: Fix coalescing of shared app GIDs and system UIDs
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

8 years agoam ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
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.

8 years agoMerge "Show storage slow dialog allowing state loss." into mnc-dev
Jeff Sharkey [Fri, 14 Aug 2015 01:18:18 +0000 (01:18 +0000)]
Merge "Show storage slow dialog allowing state loss." into mnc-dev

8 years agoShow storage slow dialog allowing state loss.
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

8 years agoMake "Ask every time" actually work that way
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

8 years agoam eea96f22: (-s ours) Import translations. DO NOT MERGE
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

8 years agoImport 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

8 years agoMerge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
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

8 years agoWait with finishing until fingerprints are removed
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

8 years agoam f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings...
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

8 years agoMerge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev
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

8 years agoFix issue #23116383: Include security patch level in Settings
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

8 years agoFix Usb-C dialog issues
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

8 years agoMerge "Avoid sending identity along with EAP sim, aka & aka'." into mnc-dr-dev
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoAvoid sending identity along with EAP sim, aka & aka'.
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

8 years agoam 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
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

8 years agoMerge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
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

8 years agoam 8500822b: Merge "Fix issue #23079119: Description for write settings permission...
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...

8 years agoMerge "Fix issue #23079119: Description for write settings permission says..." into...
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

8 years ago[ConfirmPattern] use correct user id for stealth mode
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

8 years agoam 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
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

8 years agoMerge "[Fingerprint] Use different ring size for setup" into mnc-dev
Maurice Lam [Tue, 11 Aug 2015 22:35:53 +0000 (22:35 +0000)]
Merge "[Fingerprint] Use different ring size for setup" into mnc-dev

8 years agoMerge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-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

8 years agoGray out confirm button on pattern/pin/password set dialog
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

8 years agoFix issue #23079119: Description for write settings permission says...
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

8 years agoMerge "Add setting to disable camera gesture" into mnc-dr-dev
Jason Monk [Tue, 11 Aug 2015 13:55:54 +0000 (13:55 +0000)]
Merge "Add setting to disable camera gesture" into mnc-dr-dev

8 years agoam be4df036: Fix issue #23037899: Support for Battery Optimization permission + Dialog
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

8 years agoam ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
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

8 years agoFix issue #23037899: Support for Battery Optimization permission + Dialog
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

8 years agoMerge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
Dianne Hackborn [Tue, 11 Aug 2015 00:06:43 +0000 (00:06 +0000)]
Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

8 years agoFix issue #23037720: New Battery Optimization Strings
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

8 years agoam 996e285c: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
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

8 years agoMerge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
Dianne Hackborn [Mon, 10 Aug 2015 21:55:23 +0000 (21:55 +0000)]
Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

8 years agoam 2557d8a2: Merge "Wrap text on long preferences." 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.

8 years agoMerge "Wrap text on long preferences." into mnc-dev
Julia Reynolds [Mon, 10 Aug 2015 20:32:49 +0000 (20:32 +0000)]
Merge "Wrap text on long preferences." into mnc-dev

8 years agoam cf1e22f4: Merge "Remove extra help & feedback menu from power usage" 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

8 years agoMerge "Remove extra help & feedback menu from power usage" into mnc-dev
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

8 years agoRemove extra help & feedback menu from power usage
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

8 years agoam 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev
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

8 years agoMerge "Ensure that listener is removed only if it was added" into mnc-dev
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoam 67f0739c: Merge "Block moving when already in progress." into mnc-dev
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.

8 years agoMerge "Block moving when already in progress." into mnc-dev
Jeff Sharkey [Fri, 7 Aug 2015 23:38:44 +0000 (23:38 +0000)]
Merge "Block moving when already in progress." into mnc-dev

8 years agoBlock moving when already in progress.
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

8 years agoam a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS...
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

8 years agoMerge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
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

8 years agoam e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
Dianne Hackborn [Fri, 7 Aug 2015 22:05:56 +0000 (22:05 +0000)]
am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

* commit 'e7a5966aa72a7a64358e4092fa3fe2b46b28c420':
  Fix issue #23037720: New Battery Optimization Strings

8 years agoMerge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
Dianne Hackborn [Fri, 7 Aug 2015 21:58:52 +0000 (21:58 +0000)]
Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

8 years agoFix issue #23037720: New Battery Optimization Strings
Dianne Hackborn [Fri, 7 Aug 2015 21:38:06 +0000 (14:38 -0700)]
Fix issue #23037720: New Battery Optimization Strings

Thar be strings.

Change-Id: Ieb43d041912cc5d2cc181d3232e01dbfce6cbc0e

8 years agoFix issue #23037720: New Battery Optimization Strings
Dianne Hackborn [Fri, 7 Aug 2015 21:38:06 +0000 (14:38 -0700)]
Fix issue #23037720: New Battery Optimization Strings

There be strings.

Change-Id: I92d4bd64f36f7d186a383178d55fbff26078509c

8 years agoEnsure that listener is removed only if it was added
Pavel Zhamaitsiak [Fri, 7 Aug 2015 19:02:38 +0000 (12:02 -0700)]
Ensure that listener is removed only if it was added

Bug: 23016088
Change-Id: Ia6f17739ffc841ce8483e9c6c8132a94ecd62200

8 years ago[Fingerprint] Use different ring size for setup
Maurice Lam [Wed, 5 Aug 2015 04:29:07 +0000 (21:29 -0700)]
[Fingerprint] Use different ring size for setup

Follow-up on ag/741340, to split the size of the fingerprint ring
during setup vs in settings. The ring in settings is slightly bigger
because the header is smaller and the error text will not be cropped.

Bug: 22924280
Change-Id: I4b9a817c85a3683924a01e41552ca80c85423f29

8 years agoam 5ab0e183: Merge "Hide optimization control on battery details page for non whiteli...
Julia Reynolds [Fri, 7 Aug 2015 16:34:58 +0000 (16:34 +0000)]
am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev

* commit '5ab0e183abdd4008c5591011804d0bc770851a7f':
  Hide optimization control on battery details page for non whitelisted apps.

8 years agoMerge "Hide optimization control on battery details page for non whitelisted apps...
Julia Reynolds [Fri, 7 Aug 2015 16:29:41 +0000 (16:29 +0000)]
Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev

8 years agoam 2d546b77: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Fri, 7 Aug 2015 04:44:05 +0000 (04:44 +0000)]
am 2d546b77: (-s ours) Import translations. DO NOT MERGE

* commit '2d546b77b997376416e2ba22d5a01ef6da27cbb3':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 7 Aug 2015 04:20:12 +0000 (21:20 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 22879473
Bug: 22719051
Change-Id: Ic6f0352135604d3a4d02ecfc9713f21191b046fd