OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoMerge "Fix init order so we have something to measure." into mnc-dev
Jeff Sharkey [Mon, 6 Jul 2015 18:00:32 +0000 (18:00 +0000)]
Merge "Fix init order so we have something to measure." into mnc-dev

9 years agoMerge changes from topic 'mig' into mnc-dev
Jeff Sharkey [Mon, 6 Jul 2015 17:57:51 +0000 (17:57 +0000)]
Merge changes from topic 'mig' into mnc-dev

* changes:
  Fix some ordering, colors, and accessibility bugs.
  Handle missing migration source volume.

9 years agoFix init order so we have something to measure.
Jeff Sharkey [Mon, 6 Jul 2015 17:17:42 +0000 (10:17 -0700)]
Fix init order so we have something to measure.

Otherwise we start measuring without shared storage in place, meaning
we always find sizes of 0.

Bug: 22231501
Change-Id: I760064684e76e5ef5cce351aee1d81a971f4d4ea

9 years agoam 7f39ae10: (-s ours) am b9819796: (-s ours) am 1c2260a1: (-s ours) am c869c959...
Geoff Mendal [Mon, 6 Jul 2015 16:08:19 +0000 (16:08 +0000)]
am 7f39ae10: (-s ours) am b9819796: (-s ours) am 1c2260a1: (-s ours) am c869c959: (-s ours) am e21573da: (-s ours) Import translations. DO NOT MERGE

* commit '7f39ae1030920ac3d3a2ae4c6cfa1fb028e988e9':
  Import translations. DO NOT MERGE

9 years agoam b9819796: (-s ours) am 1c2260a1: (-s ours) am c869c959: (-s ours) am e21573da...
Geoff Mendal [Mon, 6 Jul 2015 15:53:50 +0000 (15:53 +0000)]
am b9819796: (-s ours) am 1c2260a1: (-s ours) am c869c959: (-s ours) am e21573da: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 1c2260a1: (-s ours) am c869c959: (-s ours) am e21573da: (-s ours) Import translati...
Geoff Mendal [Mon, 6 Jul 2015 15:33:03 +0000 (15:33 +0000)]
am 1c2260a1: (-s ours) am c869c959: (-s ours) am e21573da: (-s ours) Import translations. DO NOT MERGE

* commit '1c2260a107cd5ffa708e8addf2501014d86dc37e':
  Import translations. DO NOT MERGE

9 years agoam c869c959: (-s ours) am e21573da: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 15:17:10 +0000 (15:17 +0000)]
am c869c959: (-s ours) am e21573da: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam e21573da: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 15:02:23 +0000 (15:02 +0000)]
am e21573da: (-s ours) Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 14:49:17 +0000 (07:49 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2ca583a0b6b57e1c1cc27e5aaae009e85f906b86
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 14:13:18 +0000 (07:13 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iaaba64c90d35db2817b0a889ab58b398b7f9d8b7
Auto-generated-cl: translation import

9 years agoFix some ordering, colors, and accessibility bugs.
Jeff Sharkey [Mon, 6 Jul 2015 05:09:07 +0000 (22:09 -0700)]
Fix some ordering, colors, and accessibility bugs.

When adding preferences to public/private details screens, always
add in-order when rebuilding.  Hacky fix for broken summary text and
eject image color tints.

Fix crash when device rotated during partitioning.  Set correct
accessibility titles in all wizard steps.

Bug: 2209804421376962
Change-Id: I68aff96cba497a91919cad8865722bc9cef7eaa7

9 years agoHandle missing migration source volume.
Jeff Sharkey [Sun, 5 Jul 2015 21:17:40 +0000 (14:17 -0700)]
Handle missing migration source volume.

Users can try migrating primary storage while the current location
is missing/unmounted.  Fail gracefully instead of runtime restarting.

Bug: 21927076
Change-Id: I54b92487faf9e62d5d309734bf4c436a9259d156

9 years agoam b3b15d24: am bdfc2b0f: am 5b45c3cb: Fix build
Svetoslav [Sat, 4 Jul 2015 08:05:35 +0000 (08:05 +0000)]
am b3b15d24: am bdfc2b0f: am 5b45c3cb: Fix build

* commit 'b3b15d24df2cde3b5a497d722c8ea2d7f9ef574a':
  Fix build

9 years agoam a0918440: am f35bd641: am b8b20a50: Merge "Fix USB mode development setting" into...
Marco Nelissen [Sat, 4 Jul 2015 08:04:30 +0000 (08:04 +0000)]
am a0918440: am f35bd641: am b8b20a50: Merge "Fix USB mode development setting" into mnc-dev

* commit 'a0918440803bcfa1d28472d70dd0e37ca79814fb':
  Fix USB mode development setting

9 years agoMerge "Use 'setup' header illust before selecting storage type."
Daichi Hirono [Fri, 3 Jul 2015 02:14:03 +0000 (02:14 +0000)]
Merge "Use 'setup' header illust before selecting storage type."

9 years agoShow bar graphs for internal storage items (Apps, images, video etc.).
Daichi Hirono [Thu, 2 Jul 2015 08:54:29 +0000 (17:54 +0900)]
Show bar graphs for internal storage items (Apps, images, video etc.).

BUG=21898434

Change-Id: I8285088c7bef82bbd63fa38d6a95180079acd195

9 years agoUse 'setup' header illust before selecting storage type.
Daichi Hirono [Thu, 2 Jul 2015 06:38:39 +0000 (15:38 +0900)]
Use 'setup' header illust before selecting storage type.

Previously the storage setup wizard shows 'internal' header illust before user
selects storage type.  The CL turns the initial illust into 'setup' header
illust.

BUG=22211635

Change-Id: Ie429a6197d210e0bd1ef8d0af6abb6f83295ac50

9 years agoam bdfc2b0f: am 5b45c3cb: Fix build
Svetoslav [Thu, 2 Jul 2015 02:01:11 +0000 (02:01 +0000)]
am bdfc2b0f: am 5b45c3cb: Fix build

* commit 'bdfc2b0f9465f9683aa8a06443421166f5c9d398':
  Fix build

9 years agoam 5b45c3cb: Fix build
Svetoslav [Thu, 2 Jul 2015 01:47:59 +0000 (01:47 +0000)]
am 5b45c3cb: Fix build

* commit '5b45c3cb2fdd9299a3fa632047f3da1bec4e868a':
  Fix build

9 years agoFix build
Svetoslav [Thu, 2 Jul 2015 01:33:32 +0000 (18:33 -0700)]
Fix build

Change-Id: I658528a9b0a8a281a2b30b2915c1be6963759378

9 years agoam f35bd641: am b8b20a50: Merge "Fix USB mode development setting" into mnc-dev
Marco Nelissen [Thu, 2 Jul 2015 01:02:48 +0000 (01:02 +0000)]
am f35bd641: am b8b20a50: Merge "Fix USB mode development setting" into mnc-dev

* commit 'f35bd64130ceb668a8fee544ef3b888f51d3eb14':
  Fix USB mode development setting

9 years agoam b8b20a50: Merge "Fix USB mode development setting" into mnc-dev
Marco Nelissen [Thu, 2 Jul 2015 00:46:53 +0000 (00:46 +0000)]
am b8b20a50: Merge "Fix USB mode development setting" into mnc-dev

* commit 'b8b20a503255da8097d64a2f1554d118f8e3c424':
  Fix USB mode development setting

9 years agoMerge "Fix USB mode development setting" into mnc-dev
Marco Nelissen [Wed, 1 Jul 2015 19:13:43 +0000 (19:13 +0000)]
Merge "Fix USB mode development setting" into mnc-dev

9 years agoam 5393ac02: (-s ours) am ad44e83e: (-s ours) am 85a71d6a: (-s ours) Merge "Import...
Geoff Mendal [Wed, 1 Jul 2015 17:24:44 +0000 (17:24 +0000)]
am 5393ac02: (-s ours) am ad44e83e: (-s ours) am 85a71d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '5393ac023622a3dc7db92c723294d6f2ec96c0d2':
  Import translations. DO NOT MERGE

9 years agoam 3988dd5a: am a6eca19a: am f7806581: Avoid crashing
Jason Monk [Wed, 1 Jul 2015 17:24:42 +0000 (17:24 +0000)]
am 3988dd5a: am a6eca19a: am f7806581: Avoid crashing

* commit '3988dd5a6baa2d061da605aebd6f54566f51bbfa':
  Avoid crashing

9 years agoam bd17cc35: am 76ffaaa2: am ad1f28cd: Device Discoverability not set properly when...
Avish Shah [Wed, 1 Jul 2015 17:24:41 +0000 (17:24 +0000)]
am bd17cc35: am 76ffaaa2: am ad1f28cd: Device Discoverability not set properly when Bluetooth is toggled

* commit 'bd17cc3560c3697e8319e3012ebcde4c659a55d2':
  Device Discoverability not set properly when Bluetooth is toggled

9 years agoam ad44e83e: (-s ours) am 85a71d6a: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 1 Jul 2015 17:12:43 +0000 (17:12 +0000)]
am ad44e83e: (-s ours) am 85a71d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam a6eca19a: am f7806581: Avoid crashing
Jason Monk [Wed, 1 Jul 2015 17:12:42 +0000 (17:12 +0000)]
am a6eca19a: am f7806581: Avoid crashing

* commit 'a6eca19ad15eb75588635f89dec1093c9eecffdf':
  Avoid crashing

9 years agoam 76ffaaa2: am ad1f28cd: Device Discoverability not set properly when Bluetooth...
Avish Shah [Wed, 1 Jul 2015 17:12:41 +0000 (17:12 +0000)]
am 76ffaaa2: am ad1f28cd: Device Discoverability not set properly when Bluetooth is toggled

* commit '76ffaaa238b20cc103e8a08a22d9db1f5990ccff':
  Device Discoverability not set properly when Bluetooth is toggled

9 years agoam 85a71d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 1 Jul 2015 16:21:50 +0000 (16:21 +0000)]
am 85a71d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '85a71d6a622eef2cc5258e737c305227cebe2e95':
  Import translations. DO NOT MERGE

9 years agoam f7806581: Avoid crashing
Jason Monk [Wed, 1 Jul 2015 16:21:31 +0000 (16:21 +0000)]
am f7806581: Avoid crashing

* commit 'f7806581e582e5921d0eb4caa9751d1aa429bc47':
  Avoid crashing

9 years agoam ad1f28cd: Device Discoverability not set properly when Bluetooth is toggled
Avish Shah [Wed, 1 Jul 2015 16:19:36 +0000 (16:19 +0000)]
am ad1f28cd: Device Discoverability not set properly when Bluetooth is toggled

* commit 'ad1f28cde0ec117a0d526bae61fb661587914f33':
  Device Discoverability not set properly when Bluetooth is toggled

9 years agoFix USB mode development setting
Marco Nelissen [Tue, 30 Jun 2015 21:52:04 +0000 (14:52 -0700)]
Fix USB mode development setting

USB mode consists of the function (mtp, ptp, midi, etc) and the data
locked/unlocked state. Developer settings was only setting the
function, leaving data locked when it should be unlocked.

Bug: 22165902
Change-Id: Ia1ae8dfaf3d2abc62034aa6aea1234bad04aaa2e

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 1 Jul 2015 15:42:32 +0000 (15:42 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 1 Jul 2015 14:52:03 +0000 (07:52 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ibe88fd3db790a357712803481a4a3dc2befe22cc
Auto-generated-cl: translation import

9 years agoAvoid crashing
Jason Monk [Wed, 1 Jul 2015 14:36:30 +0000 (10:36 -0400)]
Avoid crashing

Bug: 22202631
Change-Id: I1980f77ae4300dbd19d6829dc5974bab0b88d612

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 1 Jul 2015 14:14:12 +0000 (07:14 -0700)]
Import translations. DO NOT MERGE

Change-Id: I95ed838f9970f111b844313ff244ae1b4b238937
Auto-generated-cl: translation import

9 years agoDevice Discoverability not set properly when Bluetooth is toggled
Avish Shah [Fri, 19 Jun 2015 11:20:39 +0000 (16:50 +0530)]
Device Discoverability not set properly when Bluetooth is toggled

Issue:
When BT is turned off/on staying in the same BT Settings
screen discoverability was not set again.

Fix:
Handle setting discoverability Bluetooth state change
intents also when BT state is  turned ON.

Bug: 21944289
Change-Id: Ic3c8d476c53673b21d40ea2bd9669758d89c2aee

9 years agoam b285f018: am 09948d48: am 56594c6d: Update FakeUid to implement new method defined...
Adam Lesinski [Wed, 1 Jul 2015 01:24:51 +0000 (01:24 +0000)]
am b285f018: am 09948d48: am 56594c6d: Update FakeUid to implement new method defined in BatteryStats.Uid

* commit 'b285f018beacb966ef553df9bda48f46e0357984':
  Update FakeUid to implement new method defined in BatteryStats.Uid

9 years agoam 09948d48: am 56594c6d: Update FakeUid to implement new method defined in BatterySt...
Adam Lesinski [Wed, 1 Jul 2015 01:06:54 +0000 (01:06 +0000)]
am 09948d48: am 56594c6d: Update FakeUid to implement new method defined in BatteryStats.Uid

* commit '09948d4804f34d76f8e0987efec7b313eb03e3ee':
  Update FakeUid to implement new method defined in BatteryStats.Uid

9 years agoam 56594c6d: Update FakeUid to implement new method defined in BatteryStats.Uid
Adam Lesinski [Wed, 1 Jul 2015 00:53:08 +0000 (00:53 +0000)]
am 56594c6d: Update FakeUid to implement new method defined in BatteryStats.Uid

* commit '56594c6d61c63d6cab28b32f431f6f0d9c84af91':
  Update FakeUid to implement new method defined in BatteryStats.Uid

9 years agoUpdate FakeUid to implement new method defined in BatteryStats.Uid
Adam Lesinski [Sat, 27 Jun 2015 01:05:37 +0000 (18:05 -0700)]
Update FakeUid to implement new method defined in BatteryStats.Uid

Bug:21498425
Change-Id: I956c04d13daf985d472cc7ff2762ad74d5bb9502

9 years agoam cce0d46d: am 985d1029: am fba915be: Merge "Merge dex2oat with app being installed...
Adam Lesinski [Tue, 30 Jun 2015 23:57:24 +0000 (23:57 +0000)]
am cce0d46d: am 985d1029: am fba915be: Merge "Merge dex2oat with app being installed" into mnc-dev

* commit 'cce0d46de9c5159b7ca44e27d874b6b87434abc7':
  Merge dex2oat with app being installed

9 years agoam 856bc3bd: am 5bfbc07f: am a8c4db48: Merge "Only allow admin users to adopt sd...
Amith Yamasani [Tue, 30 Jun 2015 23:43:33 +0000 (23:43 +0000)]
am 856bc3bd: am 5bfbc07f: am a8c4db48: Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev

* commit '856bc3bd12668730e4672695918f5a8361946320':
  Only allow admin users to adopt sd card as internal storage.

9 years agoam 985d1029: am fba915be: Merge "Merge dex2oat with app being installed" into mnc-dev
Adam Lesinski [Tue, 30 Jun 2015 23:40:59 +0000 (23:40 +0000)]
am 985d1029: am fba915be: Merge "Merge dex2oat with app being installed" into mnc-dev

* commit '985d10296a87fe3ffeeec18d51f9af8fc96588ed':
  Merge dex2oat with app being installed

9 years agoam fba915be: Merge "Merge dex2oat with app being installed" into mnc-dev
Adam Lesinski [Tue, 30 Jun 2015 23:30:15 +0000 (23:30 +0000)]
am fba915be: Merge "Merge dex2oat with app being installed" into mnc-dev

* commit 'fba915be162f5e32e1a614c5497ef08b216a5b3a':
  Merge dex2oat with app being installed

9 years agoam 5bfbc07f: am a8c4db48: Merge "Only allow admin users to adopt sd card as internal...
Amith Yamasani [Tue, 30 Jun 2015 23:26:32 +0000 (23:26 +0000)]
am 5bfbc07f: am a8c4db48: Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev

* commit '5bfbc07fc761009e2b4116d47d6bda7460061840':
  Only allow admin users to adopt sd card as internal storage.

9 years agoMerge "Merge dex2oat with app being installed" into mnc-dev
Adam Lesinski [Tue, 30 Jun 2015 23:16:18 +0000 (23:16 +0000)]
Merge "Merge dex2oat with app being installed" into mnc-dev

9 years agoam a8c4db48: Merge "Only allow admin users to adopt sd card as internal storage....
Amith Yamasani [Tue, 30 Jun 2015 23:13:51 +0000 (23:13 +0000)]
am a8c4db48: Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev

* commit 'a8c4db48c26634836ade77f3f8f0403089245f9c':
  Only allow admin users to adopt sd card as internal storage.

9 years agoMerge "Only allow admin users to adopt sd card as internal storage." into mnc-dev
Amith Yamasani [Tue, 30 Jun 2015 23:00:27 +0000 (23:00 +0000)]
Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev

9 years agoam a5dc01a2: am f1d70b5f: am a8af51b2: Merge "Handle adjust volume user restriction...
Jason Monk [Tue, 30 Jun 2015 21:41:31 +0000 (21:41 +0000)]
am a5dc01a2: am f1d70b5f: am a8af51b2: Merge "Handle adjust volume user restriction" into mnc-dev

* commit 'a5dc01a2b19068280f38cefb22219a3f7375a9c5':
  Handle adjust volume user restriction

9 years agoOnly allow admin users to adopt sd card as internal storage.
Amith Yamasani [Tue, 30 Jun 2015 21:23:54 +0000 (14:23 -0700)]
Only allow admin users to adopt sd card as internal storage.

Bug: 21883016
Change-Id: I11ca324ab74ce2a8bf13064b4c7735aea132c562

9 years agoam f1d70b5f: am a8af51b2: Merge "Handle adjust volume user restriction" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 21:22:35 +0000 (21:22 +0000)]
am f1d70b5f: am a8af51b2: Merge "Handle adjust volume user restriction" into mnc-dev

* commit 'f1d70b5f7da3929afbc27494539c8e1bbafd77c4':
  Handle adjust volume user restriction

9 years agoam a8af51b2: Merge "Handle adjust volume user restriction" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 20:21:50 +0000 (20:21 +0000)]
am a8af51b2: Merge "Handle adjust volume user restriction" into mnc-dev

* commit 'a8af51b2d8706455c8c541a4773c883341a5b73c':
  Handle adjust volume user restriction

9 years agoMerge "Handle adjust volume user restriction" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 20:08:13 +0000 (20:08 +0000)]
Merge "Handle adjust volume user restriction" into mnc-dev

9 years agoHandle adjust volume user restriction
Jason Monk [Tue, 30 Jun 2015 16:18:26 +0000 (12:18 -0400)]
Handle adjust volume user restriction

 - Finish all do not disturb pages immediately
 - Disable relevant items in Sounds & notification

Bug: 21642285
Change-Id: I8de9bd10b8cea8adaa306b1ae388ab7d1ccc4e7e

9 years agoam 86826083: am 3ff8ce1d: am a2bd2eac: Merge "Make sure Fragments are public for...
Makoto Onuki [Tue, 30 Jun 2015 17:37:27 +0000 (17:37 +0000)]
am 86826083: am 3ff8ce1d: am a2bd2eac: Merge "Make sure Fragments are public for FragMan to instantiate" into mnc-dev

* commit '86826083b6e9adf762d0d048c15c384c0845b1a2':
  Make sure Fragments are public for FragMan to instantiate

9 years agoam 3ff8ce1d: am a2bd2eac: Merge "Make sure Fragments are public for FragMan to instan...
Makoto Onuki [Tue, 30 Jun 2015 17:28:37 +0000 (17:28 +0000)]
am 3ff8ce1d: am a2bd2eac: Merge "Make sure Fragments are public for FragMan to instantiate" into mnc-dev

* commit '3ff8ce1d9de9efcf88981f6c9b4b63497be8ae7f':
  Make sure Fragments are public for FragMan to instantiate

9 years agoam a2bd2eac: Merge "Make sure Fragments are public for FragMan to instantiate" into...
Makoto Onuki [Tue, 30 Jun 2015 16:54:11 +0000 (16:54 +0000)]
am a2bd2eac: Merge "Make sure Fragments are public for FragMan to instantiate" into mnc-dev

* commit 'a2bd2eacc3f2688feffafa6ca7050141ad4675eb':
  Make sure Fragments are public for FragMan to instantiate

9 years agoMerge "Make sure Fragments are public for FragMan to instantiate" into mnc-dev
Makoto Onuki [Tue, 30 Jun 2015 16:40:56 +0000 (16:40 +0000)]
Merge "Make sure Fragments are public for FragMan to instantiate" into mnc-dev

9 years agoam 8d4b9243: am e6cbdf19: am e6a0bee5: Merge "Fix crash in ignore optimizations dialo...
Jason Monk [Tue, 30 Jun 2015 14:57:40 +0000 (14:57 +0000)]
am 8d4b9243: am e6cbdf19: am e6a0bee5: Merge "Fix crash in ignore optimizations dialog" into mnc-dev

* commit '8d4b924366130a8b341ead1777bbdbb4f5d7cfbe':
  Fix crash in ignore optimizations dialog

9 years agoam e6cbdf19: am e6a0bee5: Merge "Fix crash in ignore optimizations dialog" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:45:41 +0000 (14:45 +0000)]
am e6cbdf19: am e6a0bee5: Merge "Fix crash in ignore optimizations dialog" into mnc-dev

* commit 'e6cbdf19b556436ed6571f2f828ed7c1374f90ce':
  Fix crash in ignore optimizations dialog

9 years agoam e6a0bee5: Merge "Fix crash in ignore optimizations dialog" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:32:58 +0000 (14:32 +0000)]
am e6a0bee5: Merge "Fix crash in ignore optimizations dialog" into mnc-dev

* commit 'e6a0bee557c8f2ceaa25cd8287511b55479e7293':
  Fix crash in ignore optimizations dialog

9 years agoam cf0f3c13: am 4421438c: am 02c7e95f: Merge "No longer use ExternalStorageFormatter...
Rubin Xu [Tue, 30 Jun 2015 14:32:34 +0000 (14:32 +0000)]
am cf0f3c13: am 4421438c: am 02c7e95f: Merge "No longer use ExternalStorageFormatter to format external storage" into mnc-dev

* commit 'cf0f3c130f27ac9105eb56683a515a467c2a1062':
  No longer use ExternalStorageFormatter to format external storage

9 years agoam e86de04d: am a992bb3d: am 6799ef42: Merge "Reduce jank in wifi settings" into...
Jason Monk [Tue, 30 Jun 2015 14:32:33 +0000 (14:32 +0000)]
am e86de04d: am a992bb3d: am 6799ef42: Merge "Reduce jank in wifi settings" into mnc-dev

* commit 'e86de04dd6f409fd738063109e66f66ac7c17119':
  Reduce jank in wifi settings

9 years agoam 4421438c: am 02c7e95f: Merge "No longer use ExternalStorageFormatter to format...
Rubin Xu [Tue, 30 Jun 2015 14:21:06 +0000 (14:21 +0000)]
am 4421438c: am 02c7e95f: Merge "No longer use ExternalStorageFormatter to format external storage" into mnc-dev

* commit '4421438c50d076ee91b8fc333fa23c7d4dc424ed':
  No longer use ExternalStorageFormatter to format external storage

9 years agoam a992bb3d: am 6799ef42: Merge "Reduce jank in wifi settings" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:21:05 +0000 (14:21 +0000)]
am a992bb3d: am 6799ef42: Merge "Reduce jank in wifi settings" into mnc-dev

* commit 'a992bb3dfb94705053ca91ac9d31e8a530d2b984':
  Reduce jank in wifi settings

9 years agoMerge "Fix crash in ignore optimizations dialog" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:20:57 +0000 (14:20 +0000)]
Merge "Fix crash in ignore optimizations dialog" into mnc-dev

9 years agoFix crash in ignore optimizations dialog
Jason Monk [Tue, 30 Jun 2015 14:15:53 +0000 (10:15 -0400)]
Fix crash in ignore optimizations dialog

Launch it like a dialog, because it is one.

Bug: 22181580
Change-Id: Ibeda8506cfb7a9a9d60f70462a4e03972b38f8aa

9 years agoam 02c7e95f: Merge "No longer use ExternalStorageFormatter to format external storage...
Rubin Xu [Tue, 30 Jun 2015 14:12:39 +0000 (14:12 +0000)]
am 02c7e95f: Merge "No longer use ExternalStorageFormatter to format external storage" into mnc-dev

* commit '02c7e95fd4e03d7356def00f68e6e93f4da87f73':
  No longer use ExternalStorageFormatter to format external storage

9 years agoam 6799ef42: Merge "Reduce jank in wifi settings" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:12:38 +0000 (14:12 +0000)]
am 6799ef42: Merge "Reduce jank in wifi settings" into mnc-dev

* commit '6799ef423b18c37c9a8a3684159dd185f61a0931':
  Reduce jank in wifi settings

9 years agoMerge "No longer use ExternalStorageFormatter to format external storage" into mnc-dev
Rubin Xu [Tue, 30 Jun 2015 14:05:31 +0000 (14:05 +0000)]
Merge "No longer use ExternalStorageFormatter to format external storage" into mnc-dev

9 years agoMerge "Reduce jank in wifi settings" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:03:04 +0000 (14:03 +0000)]
Merge "Reduce jank in wifi settings" into mnc-dev

9 years agoam 6c8e6503: am ea53bfcd: am d9bd96b3: Add setting to disable screenshot separately...
Jorim Jaggi [Tue, 30 Jun 2015 01:01:18 +0000 (01:01 +0000)]
am 6c8e6503: am ea53bfcd: am d9bd96b3: Add setting to disable screenshot separately (2/2)

* commit '6c8e6503084845b8923b9a63c300c8f6e3dd519c':
  Add setting to disable screenshot separately (2/2)

9 years agoam ea53bfcd: am d9bd96b3: Add setting to disable screenshot separately (2/2)
Jorim Jaggi [Tue, 30 Jun 2015 00:49:24 +0000 (00:49 +0000)]
am ea53bfcd: am d9bd96b3: Add setting to disable screenshot separately (2/2)

* commit 'ea53bfcddf8c8b37a154bcbdcbbec2ee71b109d9':
  Add setting to disable screenshot separately (2/2)

9 years agoam d9bd96b3: Add setting to disable screenshot separately (2/2)
Jorim Jaggi [Tue, 30 Jun 2015 00:35:45 +0000 (00:35 +0000)]
am d9bd96b3: Add setting to disable screenshot separately (2/2)

* commit 'd9bd96b3094039fdcb8c76042a6f2dc21d6c7875':
  Add setting to disable screenshot separately (2/2)

9 years agoMerge dex2oat with app being installed
Adam Lesinski [Fri, 26 Jun 2015 23:31:44 +0000 (16:31 -0700)]
Merge dex2oat with app being installed

Bug:22008744
Change-Id: Id87fe215760202e2969c27d686fa8ba106b00754

9 years agoAdd setting to disable screenshot separately (2/2)
Jorim Jaggi [Fri, 26 Jun 2015 23:40:41 +0000 (16:40 -0700)]
Add setting to disable screenshot separately (2/2)

Bug: 22063668
Change-Id: I85b255ac114184e0edbd71010d517b337ad935e5

9 years agoam aa6a23a9: am ea673970: am 1e7b8f86: Fix userId for credentials from managed profiles
Jorim Jaggi [Mon, 29 Jun 2015 21:34:02 +0000 (21:34 +0000)]
am aa6a23a9: am ea673970: am 1e7b8f86: Fix userId for credentials from managed profiles

* commit 'aa6a23a9b2432b1483b38cfb3e33de8771d14569':
  Fix userId for credentials from managed profiles

9 years agoam ea673970: am 1e7b8f86: Fix userId for credentials from managed profiles
Jorim Jaggi [Mon, 29 Jun 2015 21:23:26 +0000 (21:23 +0000)]
am ea673970: am 1e7b8f86: Fix userId for credentials from managed profiles

* commit 'ea673970e16b49f28d7f39c8b4993f186e561d6d':
  Fix userId for credentials from managed profiles

9 years agoam 1e7b8f86: Fix userId for credentials from managed profiles
Jorim Jaggi [Mon, 29 Jun 2015 21:04:41 +0000 (21:04 +0000)]
am 1e7b8f86: Fix userId for credentials from managed profiles

* commit '1e7b8f86d8aa46d2ed24b75adb453833ef2d1a88':
  Fix userId for credentials from managed profiles

9 years agoFix userId for credentials from managed profiles
Jorim Jaggi [Sat, 27 Jun 2015 01:49:35 +0000 (18:49 -0700)]
Fix userId for credentials from managed profiles

Bug: 22094377
Change-Id: Ia98d0e386d4c56f3eb502ff11f86b0fd7dadea3c

9 years agoam 7a63a8f0: am 2d6445d4: am 312c90c8: Merge "Remove char limit from owner info"...
Jason Monk [Mon, 29 Jun 2015 20:24:51 +0000 (20:24 +0000)]
am 7a63a8f0: am 2d6445d4: am 312c90c8: Merge "Remove char limit from owner info" into mnc-dev

* commit '7a63a8f08b6391fb6b76d356411c8a1b25f66815':
  Remove char limit from owner info

9 years agoam 2d6445d4: am 312c90c8: Merge "Remove char limit from owner info" into mnc-dev
Jason Monk [Mon, 29 Jun 2015 20:16:18 +0000 (20:16 +0000)]
am 2d6445d4: am 312c90c8: Merge "Remove char limit from owner info" into mnc-dev

* commit '2d6445d4a1b99f95dd5f11561fc9392c7c9eb407':
  Remove char limit from owner info

9 years agoam 312c90c8: Merge "Remove char limit from owner info" into mnc-dev
Jason Monk [Mon, 29 Jun 2015 20:04:49 +0000 (20:04 +0000)]
am 312c90c8: Merge "Remove char limit from owner info" into mnc-dev

* commit '312c90c8caa4fdc59e9a4bd9f900d23ec7274495':
  Remove char limit from owner info

9 years agoMerge "Remove char limit from owner info" into mnc-dev
Jason Monk [Mon, 29 Jun 2015 19:52:51 +0000 (19:52 +0000)]
Merge "Remove char limit from owner info" into mnc-dev

9 years agoRemove char limit from owner info
Jason Monk [Mon, 29 Jun 2015 18:52:54 +0000 (14:52 -0400)]
Remove char limit from owner info

Bug: 21959734
Change-Id: I21854309ca390cb126ba50feaa56fb9a35b862e1

9 years agoam 9b9e75d0: am d1c770f0: am 898acde0: Merge "Handle rotation (or refresh) before...
Jason Monk [Mon, 29 Jun 2015 19:31:59 +0000 (19:31 +0000)]
am 9b9e75d0: am d1c770f0: am 898acde0: Merge "Handle rotation (or refresh) before callback is received" into mnc-dev

* commit '9b9e75d019e83cf983988c3def1904cabea412fb':
  Handle rotation (or refresh) before callback is received

9 years agoam d1c770f0: am 898acde0: Merge "Handle rotation (or refresh) before callback is...
Jason Monk [Mon, 29 Jun 2015 19:19:51 +0000 (19:19 +0000)]
am d1c770f0: am 898acde0: Merge "Handle rotation (or refresh) before callback is received" into mnc-dev

* commit 'd1c770f023c3d428b80c92277d45dcfa0ab83190':
  Handle rotation (or refresh) before callback is received

9 years agoam 898acde0: Merge "Handle rotation (or refresh) before callback is received" into...
Jason Monk [Mon, 29 Jun 2015 19:09:16 +0000 (19:09 +0000)]
am 898acde0: Merge "Handle rotation (or refresh) before callback is received" into mnc-dev

* commit '898acde0602b00599d48161c47fc0762a5e4d75f':
  Handle rotation (or refresh) before callback is received

9 years agoMerge "Handle rotation (or refresh) before callback is received" into mnc-dev
Jason Monk [Mon, 29 Jun 2015 18:55:18 +0000 (18:55 +0000)]
Merge "Handle rotation (or refresh) before callback is received" into mnc-dev

9 years agoHandle rotation (or refresh) before callback is received
Jason Monk [Mon, 29 Jun 2015 18:42:25 +0000 (14:42 -0400)]
Handle rotation (or refresh) before callback is received

Make sure we unregister the old receiver

Bug: 22160603
Change-Id: I798ca07dd65711caa4d3295b7ad811ca2fc69c1d

9 years agoReduce jank in wifi settings
Jason Monk [Mon, 29 Jun 2015 17:28:21 +0000 (13:28 -0400)]
Reduce jank in wifi settings

 - Fix view recycling for AccessPointPreferences by adding a dummy
   during initial inflation
 - Cut down on what is done during onBindView and refresh()
 - Try to re-use AccessPointPreferences when possible

Some jank still occurs when scan results come in, but it is less
than before.

Bug: 16518752
Change-Id: I2619303281dd50aa3864783c49738ae9f221834a

9 years agoam 672649b8: (-s ours) am 84a66c65: (-s ours) am 21e00f98: (-s ours) Import translati...
Geoff Mendal [Mon, 29 Jun 2015 17:26:34 +0000 (17:26 +0000)]
am 672649b8: (-s ours) am 84a66c65: (-s ours) am 21e00f98: (-s ours) Import translations. DO NOT MERGE

* commit '672649b85414cb87908f221ed30e3cabe81964eb':
  Import translations. DO NOT MERGE

9 years agoam 84a66c65: (-s ours) am 21e00f98: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 29 Jun 2015 15:17:21 +0000 (15:17 +0000)]
am 84a66c65: (-s ours) am 21e00f98: (-s ours) Import translations. DO NOT MERGE

* commit '84a66c6511910aaa1aa403aa1729eab3ec55cb7b':
  Import translations. DO NOT MERGE

9 years agoam 21e00f98: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 29 Jun 2015 15:06:30 +0000 (15:06 +0000)]
am 21e00f98: (-s ours) Import translations. DO NOT MERGE

* commit '21e00f9819f48d33958a1bda87511e38809eb9f3':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 29 Jun 2015 14:50:47 +0000 (07:50 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib4c36b177018329faa9359c2d02f3ebc33bb1134
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 29 Jun 2015 14:16:00 +0000 (07:16 -0700)]
Import translations. DO NOT MERGE

Change-Id: I75370918fd46ffa60ae0b81faed2aee3864de6b7
Auto-generated-cl: translation import

9 years agoam 4e484afa: am d52bd38d: am 52dce9d3: Merge "Hide EAP SIM, AKA & AKA\' choices in...
Sanket Padawe [Sun, 28 Jun 2015 03:22:38 +0000 (03:22 +0000)]
am 4e484afa: am d52bd38d: am 52dce9d3: Merge "Hide EAP SIM, AKA & AKA\' choices in wifi Settings if device doesn\'t support." into mnc-dev

* commit '4e484afa128a1883ef5e5a104fda0607856d6f3b':
  Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support.

9 years agoam d52bd38d: am 52dce9d3: Merge "Hide EAP SIM, AKA & AKA\' choices in wifi Settings...
Sanket Padawe [Sun, 28 Jun 2015 03:09:39 +0000 (03:09 +0000)]
am d52bd38d: am 52dce9d3: Merge "Hide EAP SIM, AKA & AKA\' choices in wifi Settings if device doesn\'t support." into mnc-dev

* commit 'd52bd38d055cfa44049f80aed700228968860c54':
  Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support.