OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoam 540afe77: am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for...
Dianne Hackborn [Tue, 11 Aug 2015 23:48:49 +0000 (23:48 +0000)]
am 540afe77: am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev

* commit '540afe774a201dc3a1ab4fff49c340bdb5b1fb8d':
  Fix issue #23079119: Description for write settings permission says...

8 years agoam e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings...
Dianne Hackborn [Tue, 11 Aug 2015 23:39:23 +0000 (23:39 +0000)]
am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev

* commit 'e2e76435f4a0604d751b32838409421b072ca25d':
  Fix issue #23079119: Description for write settings permission says...

8 years agoam 4797364d: am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size...
Maurice Lam [Tue, 11 Aug 2015 23:27:00 +0000 (23:27 +0000)]
am 4797364d: am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev

* commit '4797364d8ac175b3322f7adcb5963602f2bb18d0':
  [Fingerprint] Use different ring size for setup

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 agoam a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup...
Maurice Lam [Tue, 11 Aug 2015 23:15:33 +0000 (23:15 +0000)]
am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev

* commit 'a430ac56b22da424abeda82ca074ef19d5e9cd56':
  [Fingerprint] Use different ring size for setup

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 agoam 550f66ed: am 68f79718: Merge "Gray out confirm button on pattern/pin/password...
Paul Lawrence [Tue, 11 Aug 2015 22:35:26 +0000 (22:35 +0000)]
am 550f66ed: am 68f79718: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev

* commit '550f66edfe5ebafde3afc3ba3fd7e4160373df36':
  Gray out confirm button on pattern/pin/password set dialog

8 years agoam 68f79718: Merge "Gray out confirm button on pattern/pin/password set dialog" into...
Paul Lawrence [Tue, 11 Aug 2015 22:25:31 +0000 (22:25 +0000)]
am 68f79718: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev

* commit '68f79718f7c4f648533e1ecd7f66d0b30f161b64':
  Gray out confirm button on pattern/pin/password set dialog

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 agoam bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into mnc...
Jason Monk [Tue, 11 Aug 2015 14:08:02 +0000 (14:08 +0000)]
am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev

* commit 'bce29c8a012a27d4cd4ca87892d215e29a793fa7':
  Add setting to disable camera gesture

8 years agoam 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev
Jason Monk [Tue, 11 Aug 2015 14:02:37 +0000 (14:02 +0000)]
am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev

* commit '746886c59a20dc33d62c2dd500fd27edcf0abcca':
  Add setting to disable camera gesture

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 01cfaade: am e9bcef35: am be4df036: Fix issue #23037899: Support for Battery Optim...
Dianne Hackborn [Tue, 11 Aug 2015 00:35:12 +0000 (00:35 +0000)]
am 01cfaade: am e9bcef35: am be4df036: Fix issue #23037899: Support for Battery Optimization permission + Dialog

* commit '01cfaadeeb9eb98f9a772a85ba6c4e1034319fb5':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog

8 years agoam e9bcef35: am be4df036: Fix issue #23037899: Support for Battery Optimization permi...
Dianne Hackborn [Tue, 11 Aug 2015 00:28:17 +0000 (00:28 +0000)]
am e9bcef35: am be4df036: Fix issue #23037899: Support for Battery Optimization permission + Dialog

* commit 'e9bcef3541435c1e1a2716d48eb1c1c897841880':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog

8 years agoam 6fcacc41: am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimi...
Dianne Hackborn [Tue, 11 Aug 2015 00:27:06 +0000 (00:27 +0000)]
am 6fcacc41: am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

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

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 fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimization String...
Dianne Hackborn [Tue, 11 Aug 2015 00:19:07 +0000 (00:19 +0000)]
am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

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

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 cbfb4c4b: am fa8a85da: am 996e285c: Merge "Fix issue #23037720: New Battery Optimi...
Dianne Hackborn [Mon, 10 Aug 2015 22:15:13 +0000 (22:15 +0000)]
am cbfb4c4b: am fa8a85da: am 996e285c: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

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

8 years agoam fa8a85da: am 996e285c: Merge "Fix issue #23037720: New Battery Optimization String...
Dianne Hackborn [Mon, 10 Aug 2015 22:07:13 +0000 (22:07 +0000)]
am fa8a85da: am 996e285c: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

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

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 f47896d2: am 77dc56bc: am 2557d8a2: Merge "Wrap text on long preferences." into...
Julia Reynolds [Mon, 10 Aug 2015 20:53:31 +0000 (20:53 +0000)]
am f47896d2: am 77dc56bc: am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev

* commit 'f47896d223c715a6f480a0c7be36fc1206caf404':
  Wrap text on long preferences.

8 years agoam 77dc56bc: am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev
Julia Reynolds [Mon, 10 Aug 2015 20:45:56 +0000 (20:45 +0000)]
am 77dc56bc: am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev

* commit '77dc56bc4ce29016820dc90fea933324dc57f4be':
  Wrap text on long preferences.

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 9614b503: am a1f64bf2: am cf1e22f4: Merge "Remove extra help & feedback menu from...
Jason Monk [Mon, 10 Aug 2015 20:30:11 +0000 (20:30 +0000)]
am 9614b503: am a1f64bf2: am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev

* commit '9614b50319f8e22640fa43bb3623c41c5f412338':
  Remove extra help & feedback menu from power usage

8 years agoam a1f64bf2: am cf1e22f4: Merge "Remove extra help & feedback menu from power usage...
Jason Monk [Mon, 10 Aug 2015 20:21:53 +0000 (20:21 +0000)]
am a1f64bf2: am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev

* commit 'a1f64bf207c452f9b0e6a558538d9614ca2bf655':
  Remove extra help & feedback menu from power usage

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 05c4a757: am f48424e1: am 8cf54264: Merge "Ensure that listener is removed only...
Pavel Zhamaitsiak [Mon, 10 Aug 2015 17:51:31 +0000 (17:51 +0000)]
am 05c4a757: am f48424e1: am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev

* commit '05c4a75701f1b1d56255b74a15cf28a018ad659a':
  Ensure that listener is removed only if it was added

8 years agoam f48424e1: am 8cf54264: Merge "Ensure that listener is removed only if it was added...
Pavel Zhamaitsiak [Mon, 10 Aug 2015 17:41:22 +0000 (17:41 +0000)]
am f48424e1: am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev

* commit 'f48424e17caf6d4e890154d45c70a125802e1682':
  Ensure that listener is removed only if it was added

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

9 years agoam 23127a61: (-s ours) am 41abf663: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 10 Aug 2015 14:20:54 +0000 (14:20 +0000)]
am 23127a61: (-s ours) am 41abf663: (-s ours) Import translations. DO NOT MERGE

* commit '23127a6123ed72451185ff5cdaa02b3c617cafe7':
  Import translations. DO NOT MERGE

9 years agoam 41abf663: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 10 Aug 2015 14:12:22 +0000 (14:12 +0000)]
am 41abf663: (-s ours) Import translations. DO NOT MERGE

* commit '41abf66362ccf9f75dc67142b48d0f31c13f1d3d':
  Import translations. DO NOT MERGE

9 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

9 years agoam c064ecdf: (-s ours) am 3ca58bbd: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 8 Aug 2015 14:45:45 +0000 (14:45 +0000)]
am c064ecdf: (-s ours) am 3ca58bbd: (-s ours) Import translations. DO NOT MERGE

* commit 'c064ecdf79ec1c4651f77e1ffcd1c3143f7b47ed':
  Import translations. DO NOT MERGE

9 years agoam 3ca58bbd: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 8 Aug 2015 14:36:30 +0000 (14:36 +0000)]
am 3ca58bbd: (-s ours) Import translations. DO NOT MERGE

* commit '3ca58bbda3d1daacc6750a1502a775641b2d0961':
  Import translations. DO NOT MERGE

9 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

9 years agoam 11088b81: am cb0c0718: am 67f0739c: Merge "Block moving when already in progress...
Jeff Sharkey [Sat, 8 Aug 2015 00:06:40 +0000 (00:06 +0000)]
am 11088b81: am cb0c0718: am 67f0739c: Merge "Block moving when already in progress." into mnc-dev

* commit '11088b815b030114b14f8a3e7d81d9238c2d51b8':
  Block moving when already in progress.

9 years agoam cb0c0718: am 67f0739c: Merge "Block moving when already in progress." into mnc-dev
Jeff Sharkey [Fri, 7 Aug 2015 23:58:46 +0000 (23:58 +0000)]
am cb0c0718: am 67f0739c: Merge "Block moving when already in progress." into mnc-dev

* commit 'cb0c07181a77ef134310c0e037345f33e7a46d9e':
  Block moving when already in progress.

9 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.

9 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

9 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

9 years agoam 8c26cbd8: am 5b2c66e4: am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE...
Billy Lau [Fri, 7 Aug 2015 22:36:29 +0000 (22:36 +0000)]
am 8c26cbd8: am 5b2c66e4: am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev

* commit '8c26cbd87e8fe5880f84c5a27c89176e045f6669':
  Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS

9 years agoam 5b2c66e4: am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in...
Billy Lau [Fri, 7 Aug 2015 22:28:38 +0000 (22:28 +0000)]
am 5b2c66e4: am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev

* commit '5b2c66e4da749ca59d09776ec7831e20d1211909':
  Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS

9 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

9 years agoam 1ded4413: am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Battery Optimi...
Dianne Hackborn [Fri, 7 Aug 2015 22:20:50 +0000 (22:20 +0000)]
am 1ded4413: am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

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

9 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

9 years agoam 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization String...
Dianne Hackborn [Fri, 7 Aug 2015 22:12:58 +0000 (22:12 +0000)]
am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

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

9 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

9 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

9 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

9 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

9 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

9 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

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

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

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

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

9 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.

9 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

9 years agoam 233f1b61: (-s ours) am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translati...
Geoff Mendal [Fri, 7 Aug 2015 04:55:25 +0000 (04:55 +0000)]
am 233f1b61: (-s ours) am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE

* commit '233f1b61ce627819adb4351eb0b2d78f3020a38d':
  Import translations. DO NOT MERGE

9 years agoam 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Fri, 7 Aug 2015 04:48:08 +0000 (04:48 +0000)]
am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE

* commit '6540a97291a5217558e67e5ed4186a25fbd16145':
  Import translations. DO NOT MERGE

9 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

9 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

9 years agoam 13d38763: am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
Andres Morales [Thu, 6 Aug 2015 22:41:42 +0000 (22:41 +0000)]
am 13d38763: am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev

* commit '13d387631f586d03a77aace9da9a991d5aea32ba':
  fix CC for work profiles

9 years agoam d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
Andres Morales [Thu, 6 Aug 2015 22:36:04 +0000 (22:36 +0000)]
am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev

* commit 'd4c3dff6e3f900ab5693c9406ea625c2e398f7ba':
  fix CC for work profiles

9 years agoam 4897fa87: Merge "fix CC for work profiles" into mnc-dev
Andres Morales [Thu, 6 Aug 2015 22:30:55 +0000 (22:30 +0000)]
am 4897fa87: Merge "fix CC for work profiles" into mnc-dev

* commit '4897fa87a55173f45bfddb2480a2e34eb412b8ef':
  fix CC for work profiles

9 years agoMerge "fix CC for work profiles" into mnc-dev
Andres Morales [Thu, 6 Aug 2015 22:22:17 +0000 (22:22 +0000)]
Merge "fix CC for work profiles" into mnc-dev

9 years agoWrap text on long preferences.
Julia Reynolds [Thu, 6 Aug 2015 18:21:31 +0000 (14:21 -0400)]
Wrap text on long preferences.

Bug: 22987590
Change-Id: Iaef2c7d7d4581372a381d537f6d85a64d94bdf12

9 years agoHide optimization control on battery details page for non whitelisted apps.
Julia Reynolds [Thu, 6 Aug 2015 14:54:44 +0000 (10:54 -0400)]
Hide optimization control on battery details page for non whitelisted apps.

Bug: 22978210
Change-Id: If532960478dccf6ef9bea08a27167e1850749277

9 years agoam 05facd93: (-s ours) am 18d86828: (-s ours) am 7930f872: (-s ours) Import translati...
Geoff Mendal [Thu, 6 Aug 2015 04:32:56 +0000 (04:32 +0000)]
am 05facd93: (-s ours) am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE

* commit '05facd935a44d882ca6f5e0ee7b3b1cffd1c0ad4':
  Import translations. DO NOT MERGE

9 years agoam 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:24:45 +0000 (04:24 +0000)]
am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE

* commit '18d8682802460074f4b0e628bae4d4051d542c77':
  Import translations. DO NOT MERGE

9 years agoam 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:24:30 +0000 (04:24 +0000)]
am 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translations. DO NOT MERGE

* commit '40f6e9ab3ea41203d0ba1737713db58751e1995d':
  Import translations. DO NOT MERGE

9 years agoam 90c22976: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:20:45 +0000 (04:20 +0000)]
am 90c22976: (-s ours) Import translations. DO NOT MERGE

* commit '90c2297645341f347f56b160f06551963c64d039':
  Import translations. DO NOT MERGE

9 years agoam 7930f872: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:20:33 +0000 (04:20 +0000)]
am 7930f872: (-s ours) Import translations. DO NOT MERGE

* commit '7930f872ad6b3f0e27c41d848131204eac0cd705':
  Import translations. DO NOT MERGE

9 years agofix CC for work profiles
Andres Morales [Tue, 4 Aug 2015 23:55:00 +0000 (16:55 -0700)]
fix CC for work profiles

Bug: 22257554
Change-Id: I09f62956d01f91d3014d9fa250aaff68ab5e1a9b

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 01:24:49 +0000 (18:24 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 22390723
Change-Id: I2098bcc385398b9e2ac2be40f18e98819d52dc7c

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 01:15:07 +0000 (18:15 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 22390723
Change-Id: Ifa5940a4053147c433ff717d920c6f724b53affa

9 years agoam 5b12cb77: am 150e60ca: am 888673bd: Hide show/hide system from battery optimizatio...
Jason Monk [Wed, 5 Aug 2015 20:44:41 +0000 (20:44 +0000)]
am 5b12cb77: am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list

* commit '5b12cb7712d85025c93ad941b0694916c0566a37':
  Hide show/hide system from battery optimizations list

9 years agoam 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list
Jason Monk [Wed, 5 Aug 2015 20:37:17 +0000 (20:37 +0000)]
am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list

* commit '150e60ca9ad594d36aa12b425836a7d61b68501c':
  Hide show/hide system from battery optimizations list

9 years agoam 888673bd: Hide show/hide system from battery optimizations list
Jason Monk [Wed, 5 Aug 2015 20:30:40 +0000 (20:30 +0000)]
am 888673bd: Hide show/hide system from battery optimizations list

* commit '888673bd51acf9263163acfebdd0680358deabaa':
  Hide show/hide system from battery optimizations list

9 years agoam eb04b01b: am ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am...
Sanket Padawe [Wed, 5 Aug 2015 20:27:24 +0000 (20:27 +0000)]
am eb04b01b: am ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit 'eb04b01b3ffc44f6dec1a7d24228fcd4ab6116ee':
  Check for special char when renaming device for Wi-Fi direct.

9 years agoam ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am...
Sanket Padawe [Wed, 5 Aug 2015 20:20:47 +0000 (20:20 +0000)]
am ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit 'ac02e250c1540c85c29e0ae753cb365c155c2968':
  Check for special char when renaming device for Wi-Fi direct.

9 years agoam 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am...
Sanket Padawe [Wed, 5 Aug 2015 20:12:00 +0000 (20:12 +0000)]
am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '151612fb0de35fd2fadb096511f108b433100149':
  Check for special char when renaming device for Wi-Fi direct.

9 years agoHide show/hide system from battery optimizations list
Jason Monk [Wed, 5 Aug 2015 20:06:19 +0000 (16:06 -0400)]
Hide show/hide system from battery optimizations list

Bug: 22977820
Change-Id: I1741bfe3e8703bae8ce10503879adfd12e9eb4fc

9 years agoam 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am...
Sanket Padawe [Wed, 5 Aug 2015 20:07:15 +0000 (20:07 +0000)]
am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '5f9d15ed252e0870097533bd75a759f28f2bda0d':
  Check for special char when renaming device for Wi-Fi direct.

9 years agoam 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am...
Sanket Padawe [Wed, 5 Aug 2015 18:28:12 +0000 (18:28 +0000)]
am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '86d853000feca5a627ef87760cdd7df3c3aea1bb':
  Check for special char when renaming device for Wi-Fi direct.

9 years agoam f1ffec39: am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory...
Ajay Panicker [Wed, 5 Aug 2015 18:26:05 +0000 (18:26 +0000)]
am f1ffec39: am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev

* commit 'f1ffec39b64d85b361f7814690fd5eec0a176f51':
  Implement Bluetooth settings factory reset (5/5)

9 years agoam 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5...
Ajay Panicker [Wed, 5 Aug 2015 18:16:29 +0000 (18:16 +0000)]
am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev

* commit '1dd985abdc5e2a04cf97b4dce778db89891e5064':
  Implement Bluetooth settings factory reset (5/5)

9 years agoam cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
Ajay Panicker [Wed, 5 Aug 2015 18:01:14 +0000 (18:01 +0000)]
am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev

* commit 'cd8acb2256ca37ac4d1b71c513bac4e541c67c6d':
  Implement Bluetooth settings factory reset (5/5)

9 years agoMerge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
Ajay Panicker [Wed, 5 Aug 2015 17:49:08 +0000 (17:49 +0000)]
Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev