git.osdn.net Git - android-x86/packages-apps-Settings.git/log

Fyodor Kupolov [Tue, 19 May 2015 23:02:54 +0000 (23:02 +0000)]

am eecff41c: am dc774b61: am c80084e5: Merge "Added SearchIndexProvider for UserSettings" into mnc-dev

* commit 'eecff41cfc812981a8437d2d9b554a18a3a32a05':
Added SearchIndexProvider for UserSettings

commit | commitdiff | tree

Jeff Sharkey [Tue, 19 May 2015 23:02:53 +0000 (23:02 +0000)]

am 1ccf4441: am 719d0ad9: am d0393cd0: Merge "Warn user when adopted device is slow." into mnc-dev

* commit '1ccf44418ea5c86406136380434be52a3effda3a':
Warn user when adopted device is slow.

commit | commitdiff | tree

Xiyuan Xia [Tue, 19 May 2015 23:02:51 +0000 (23:02 +0000)]

am a61ad9e5: am 0fa945f0: am 3a310719: Merge "No input instead of disabling password/pin entry" into mnc-dev

* commit 'a61ad9e5e58cf12eecd73717f9dec6bb48e895e7':
No input instead of disabling password/pin entry

commit | commitdiff | tree

Guang Zhu [Tue, 19 May 2015 23:02:50 +0000 (23:02 +0000)]

am 7375f0df: am b340980d: am ccfbb1d6: Merge "Monkey should not be allowed to switch USB mode" into mnc-dev

* commit '7375f0df8940653eb13801b6583a5e4746a42fef':
Monkey should not be allowed to switch USB mode

commit | commitdiff | tree

Nicolas Prevot [Tue, 19 May 2015 23:02:49 +0000 (23:02 +0000)]

am 93a46554: am e60c44a8: am e74fdb8d: Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev

* commit '93a465546094e6a8f40afdeaf1673682e0eb2297':
Remove the check hasMultipleUsers in Settings.

commit | commitdiff | tree

Jason Monk [Tue, 19 May 2015 23:02:48 +0000 (23:02 +0000)]

am 070b24ad: am 0a42a67d: am 2b768522: Merge "Default ignore optimizations to show system apps" into mnc-dev

* commit '070b24ade271d704710ada32ee936bbfa4c25bd1':
Default ignore optimizations to show system apps

commit | commitdiff | tree

Fyodor Kupolov [Tue, 19 May 2015 22:52:06 +0000 (22:52 +0000)]

am dc774b61: am c80084e5: Merge "Added SearchIndexProvider for UserSettings" into mnc-dev

* commit 'dc774b618bf8f0ce30b50fe2f4bb0972308a34f7':
Added SearchIndexProvider for UserSettings

commit | commitdiff | tree

Jeff Sharkey [Tue, 19 May 2015 22:51:15 +0000 (22:51 +0000)]

am 719d0ad9: am d0393cd0: Merge "Warn user when adopted device is slow." into mnc-dev

* commit '719d0ad90479fc84d0dad1a8fa539b7fee4da746':
Warn user when adopted device is slow.

commit | commitdiff | tree

Xiyuan Xia [Tue, 19 May 2015 22:51:07 +0000 (22:51 +0000)]

am 0fa945f0: am 3a310719: Merge "No input instead of disabling password/pin entry" into mnc-dev

* commit '0fa945f099364ff05e42899a1da989b12da0a043':
No input instead of disabling password/pin entry

commit | commitdiff | tree

Guang Zhu [Tue, 19 May 2015 22:50:48 +0000 (22:50 +0000)]

am b340980d: am ccfbb1d6: Merge "Monkey should not be allowed to switch USB mode" into mnc-dev

* commit 'b340980deea8a6948d4e8a602557b5721d45a662':
Monkey should not be allowed to switch USB mode

commit | commitdiff | tree

Nicolas Prevot [Tue, 19 May 2015 22:50:35 +0000 (22:50 +0000)]

am e60c44a8: am e74fdb8d: Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev

* commit 'e60c44a8e6ac1fe0c22d57f649462d3657cb293e':
Remove the check hasMultipleUsers in Settings.

commit | commitdiff | tree

Jason Monk [Tue, 19 May 2015 22:50:34 +0000 (22:50 +0000)]

am 0a42a67d: am 2b768522: Merge "Default ignore optimizations to show system apps" into mnc-dev

* commit '0a42a67d4e27fe5b144e2fd41efb8cc273ec63eb':
Default ignore optimizations to show system apps

commit | commitdiff | tree

Fyodor Kupolov [Tue, 19 May 2015 21:47:04 +0000 (21:47 +0000)]

am c80084e5: Merge "Added SearchIndexProvider for UserSettings" into mnc-dev

* commit 'c80084e55afeaeebfb0546c0112fb2e666e35700':
Added SearchIndexProvider for UserSettings

commit | commitdiff | tree

Fyodor Kupolov [Tue, 19 May 2015 21:44:17 +0000 (21:44 +0000)]

Merge "Added SearchIndexProvider for UserSettings" into mnc-dev

commit | commitdiff | tree

Fyodor Kupolov [Tue, 19 May 2015 21:31:19 +0000 (21:31 +0000)]

am db80e588: am e84a5eac: Merge "Remove the check hasMultipleUsers in Settings."

* commit 'db80e588c0f2c585e3dddb79fdd35b3f50ba8bb2':
Remove the check hasMultipleUsers in Settings.

commit | commitdiff | tree

Fyodor Kupolov [Tue, 19 May 2015 21:17:48 +0000 (21:17 +0000)]

am e84a5eac: Merge "Remove the check hasMultipleUsers in Settings."

* commit 'e84a5eac2cff89a2e380935ee10c685e4b1a58f0':
Remove the check hasMultipleUsers in Settings.

commit | commitdiff | tree

Jeff Sharkey [Tue, 19 May 2015 19:10:53 +0000 (19:10 +0000)]

am d0393cd0: Merge "Warn user when adopted device is slow." into mnc-dev

* commit 'd0393cd0417ecc8aed686578381745a88fb77f92':
Warn user when adopted device is slow.

commit | commitdiff | tree

Jeff Sharkey [Tue, 19 May 2015 19:03:34 +0000 (19:03 +0000)]

Merge "Warn user when adopted device is slow." into mnc-dev

commit | commitdiff | tree

Jeff Sharkey [Tue, 19 May 2015 18:22:33 +0000 (11:22 -0700)]

Warn user when adopted device is slow.

For now, warn user if benchmark takes longer than a simple threshold
of 2 seconds.

Bug: 21172095
Change-Id: I6d43ee93ac2ff669115519e6a856f8c314915a47

commit | commitdiff | tree

Xiyuan Xia [Tue, 19 May 2015 18:39:31 +0000 (18:39 +0000)]

am 3a310719: Merge "No input instead of disabling password/pin entry" into mnc-dev

* commit '3a310719d816b8608cd51469c62231a1ed41a608':
No input instead of disabling password/pin entry

commit | commitdiff | tree

Fyodor Kupolov [Sat, 16 May 2015 00:16:15 +0000 (17:16 -0700)]

Added SearchIndexProvider for UserSettings

It enables customizations for certain cases like whether the user is able to
create restricted profiles or multiuser UI is disabled.

Bug: 21197002
Change-Id: Ia672c0f9bb451877f8debe04438b46cb2b7e9242

commit | commitdiff | tree

Xiyuan Xia [Tue, 19 May 2015 18:30:19 +0000 (18:30 +0000)]

Merge "No input instead of disabling password/pin entry" into mnc-dev

commit | commitdiff | tree

Guang Zhu [Tue, 19 May 2015 18:21:53 +0000 (18:21 +0000)]

am ccfbb1d6: Merge "Monkey should not be allowed to switch USB mode" into mnc-dev

* commit 'ccfbb1d6ca30dd495938a6e68ca02410e7ffb6c7':
Monkey should not be allowed to switch USB mode

commit | commitdiff | tree

Guang Zhu [Tue, 19 May 2015 18:14:45 +0000 (18:14 +0000)]

Merge "Monkey should not be allowed to switch USB mode" into mnc-dev

commit | commitdiff | tree

Guang Zhu [Tue, 19 May 2015 18:08:39 +0000 (11:08 -0700)]

Monkey should not be allowed to switch USB mode

Change-Id: Ifb4865d234e0d9e6453f88d37c12744b9daefa62

commit | commitdiff | tree

Nicolas Prevot [Tue, 19 May 2015 18:09:12 +0000 (18:09 +0000)]

am e74fdb8d: Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev

* commit 'e74fdb8d672a361f5a29cded65278054e1683fc6':
Remove the check hasMultipleUsers in Settings.

commit | commitdiff | tree

Jason Monk [Tue, 19 May 2015 18:09:11 +0000 (18:09 +0000)]

am 2b768522: Merge "Default ignore optimizations to show system apps" into mnc-dev

* commit '2b7685224d1021a9e163a2ffc4bf4e8d38b56252':
Default ignore optimizations to show system apps

commit | commitdiff | tree

Nicolas Prevot [Tue, 19 May 2015 17:58:45 +0000 (17:58 +0000)]

Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev

commit | commitdiff | tree

Jason Monk [Tue, 19 May 2015 17:57:13 +0000 (17:57 +0000)]

Merge "Default ignore optimizations to show system apps" into mnc-dev

commit | commitdiff | tree

Fyodor Kupolov [Tue, 19 May 2015 17:50:00 +0000 (17:50 +0000)]

Merge "Remove the check hasMultipleUsers in Settings."

commit | commitdiff | tree

Jason Monk [Tue, 19 May 2015 17:08:39 +0000 (13:08 -0400)]

Default ignore optimizations to show system apps

Bug: 21211422
Change-Id: Ied526cffa86406b8b81824cf2cdb03cc37bb7433

commit | commitdiff | tree

Robin Lee [Tue, 19 May 2015 13:53:50 +0000 (13:53 +0000)]

am 4dda36a2: am 7526238a: am 196d0543: Merge "Badge managed WiFi networks" into mnc-dev

* commit '4dda36a220ee646e4a22bd2d6f44be5b1c6d568b':
Badge managed WiFi networks

commit | commitdiff | tree

Robin Lee [Tue, 19 May 2015 13:42:54 +0000 (13:42 +0000)]

am 7526238a: am 196d0543: Merge "Badge managed WiFi networks" into mnc-dev

* commit '7526238a74fe4565a8ed2c29b43e8535650fb4b1':
Badge managed WiFi networks

commit | commitdiff | tree

Robin Lee [Tue, 19 May 2015 13:31:37 +0000 (13:31 +0000)]

am 196d0543: Merge "Badge managed WiFi networks" into mnc-dev

* commit '196d0543737cef8fcf5e193af688a093a3743597':
Badge managed WiFi networks

commit | commitdiff | tree

Robin Lee [Tue, 19 May 2015 13:22:09 +0000 (13:22 +0000)]

Merge "Badge managed WiFi networks" into mnc-dev

commit | commitdiff | tree

Robin Lee [Tue, 19 May 2015 10:48:26 +0000 (10:48 +0000)]

am d234296b: am c0d07e31: am b5c48a4c: Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev

* commit 'd234296b96d6dfbcf2fef205d7b86a1456e69631':
VPN: UI for forgetting disconnected VPNs

commit | commitdiff | tree

Robin Lee [Tue, 19 May 2015 10:36:51 +0000 (10:36 +0000)]

am c0d07e31: am b5c48a4c: Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev

* commit 'c0d07e314a74a3910fee969a55e442f045979ed7':
VPN: UI for forgetting disconnected VPNs

commit | commitdiff | tree

Robin Lee [Tue, 19 May 2015 10:25:58 +0000 (10:25 +0000)]

am b5c48a4c: Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev

* commit 'b5c48a4c347f7aa64b99e80370a63b3f60d3203c':
VPN: UI for forgetting disconnected VPNs

commit | commitdiff | tree

Robin Lee [Tue, 19 May 2015 10:14:55 +0000 (10:14 +0000)]

Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev

commit | commitdiff | tree

Jorim Jaggi [Tue, 19 May 2015 05:14:01 +0000 (05:14 +0000)]

am 65e43332: am a351cda3: am a2138a34: Merge "Add setting to disable assist data (2/2)." into mnc-dev

* commit '65e43332cc5d742b5ecb71095cb911be21515767':
  Add setting to disable assist data (2/2).
  Try not to crash while AppInfo is finishing
  Banish the memory page to Apps > Advanced
  Fix crash when removing fingerprint
  Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException

commit | commitdiff | tree

Jorim Jaggi [Tue, 19 May 2015 05:02:24 +0000 (05:02 +0000)]

am a351cda3: am a2138a34: Merge "Add setting to disable assist data (2/2)." into mnc-dev

* commit 'a351cda36ef5f3f81e6aadeea9f9dc2b36701faf':
  Add setting to disable assist data (2/2).
  Try not to crash while AppInfo is finishing
  Banish the memory page to Apps > Advanced
  Fix crash when removing fingerprint
  Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException

commit | commitdiff | tree

Jorim Jaggi [Tue, 19 May 2015 04:51:08 +0000 (04:51 +0000)]

am a2138a34: Merge "Add setting to disable assist data (2/2)." into mnc-dev

* commit 'a2138a34852be7bcb793940269592ec5669cc3b4':
  Add setting to disable assist data (2/2).
  Try not to crash while AppInfo is finishing
  Banish the memory page to Apps > Advanced
  Fix crash when removing fingerprint
  Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException

commit | commitdiff | tree

Jorim Jaggi [Tue, 19 May 2015 04:40:08 +0000 (04:40 +0000)]

Merge "Add setting to disable assist data (2/2)." into mnc-dev

commit | commitdiff | tree

Jorim Jaggi [Tue, 19 May 2015 00:36:50 +0000 (17:36 -0700)]

Add setting to disable assist data (2/2).

Bug: 20944446
Change-Id: I3c518176cab88ce9b5031a0241bee30240e6f896

commit | commitdiff | tree

Matthew Williams [Tue, 19 May 2015 01:54:47 +0000 (01:54 +0000)]

am aa64ba55: am 9d2edaf2: am 6ee5a4d0: Update Backup/reset UI

* commit 'aa64ba5550a7d886db6772a180b563be5e706da1':
Update Backup/reset UI

commit | commitdiff | tree

Matthew Williams [Tue, 19 May 2015 01:41:38 +0000 (01:41 +0000)]

am 9d2edaf2: am 6ee5a4d0: Update Backup/reset UI

* commit '9d2edaf2bcd9e2a52e9092e40619d171847e84ee':
Update Backup/reset UI

commit | commitdiff | tree

Matthew Williams [Tue, 19 May 2015 01:31:47 +0000 (01:31 +0000)]

am 6ee5a4d0: Update Backup/reset UI

* commit '6ee5a4d0ef0386d56c72a8ae81e65443fe5a2979':
Update Backup/reset UI

commit | commitdiff | tree

Tom O'Neill [Tue, 19 May 2015 01:18:22 +0000 (01:18 +0000)]

am 45268e0b: am cc753b6a: am 16a45baf: Merge "LocationSettings javadoc describes what\'s in the UI" into mnc-dev

* commit '45268e0b508080220959232969160f5dc49d2988':
LocationSettings javadoc describes what's in the UI

commit | commitdiff | tree

Matthew Williams [Sat, 16 May 2015 04:14:14 +0000 (21:14 -0700)]

Update Backup/reset UI

BUG: 20489775
Change-Id: I2c97fdf240ddd3e9f0a518478d5da91b91abe394

commit | commitdiff | tree

Tom O'Neill [Tue, 19 May 2015 01:06:10 +0000 (01:06 +0000)]

am cc753b6a: am 16a45baf: Merge "LocationSettings javadoc describes what\'s in the UI" into mnc-dev

* commit 'cc753b6a02270ae8b99420977f32221394af370e':
LocationSettings javadoc describes what's in the UI

commit | commitdiff | tree

Tom O'Neill [Tue, 19 May 2015 00:55:39 +0000 (00:55 +0000)]

am 16a45baf: Merge "LocationSettings javadoc describes what\'s in the UI" into mnc-dev

* commit '16a45bafa78f3a2cf2b37879c57441c608b03ab7':
LocationSettings javadoc describes what's in the UI

commit | commitdiff | tree

Tom O'Neill [Tue, 19 May 2015 00:44:36 +0000 (00:44 +0000)]

Merge "LocationSettings javadoc describes what's in the UI" into mnc-dev

am 01451c89: am 43e25738: am 512bb7e2: Merge "Rename config AP Band for Select AP Band" into mnc-dev

* commit '01451c89e17878bdfefaadcfa5f0472587ad5474':
Rename config AP Band for Select AP Band

commit | commitdiff | tree

Robin Lee [Tue, 12 May 2015 17:35:37 +0000 (18:35 +0100)]

VPN: UI for forgetting disconnected VPNs

Made possible by expanded internal VPN APIs.

Bug: 20872408
Bug: 20692490
Bug: 20747154
Change-Id: Idc87084a130afa18b27c85cc9d4b5033dcedaabe

am 43e25738: am 512bb7e2: Merge "Rename config AP Band for Select AP Band" into mnc-dev

* commit '43e257381cb0be46708c5c19922e5d03e9bbb131':
Rename config AP Band for Select AP Band

commit | commitdiff | tree

Sanket Padawe [Mon, 18 May 2015 21:34:11 +0000 (21:34 +0000)]

am 35470891: am 2a7a5b8e: am 7186a47e: Check for special char when renaming device for Wi-Fi direct.

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

am 512bb7e2: Merge "Rename config AP Band for Select AP Band" into mnc-dev

* commit '512bb7e2e37512e22a466942dc7344dc12439648':
Rename config AP Band for Select AP Band

commit | commitdiff | tree

Jason Monk [Fri, 15 May 2015 17:05:46 +0000 (13:05 -0400)]

Try not to crash while AppInfo is finishing

Bug: 21025020
Change-Id: Iebb9e6b24ca503f87b5648f0aaf02dde01903488

Merge "Rename config AP Band for Select AP Band" into mnc-dev

commit | commitdiff | tree

Sanket Padawe [Mon, 18 May 2015 21:21:49 +0000 (21:21 +0000)]

am 2a7a5b8e: am 7186a47e: Check for special char when renaming device for Wi-Fi direct.

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

Rename config AP Band for Select AP Band

Bug:19095100
Change-Id: I18af303a56cf81b2a113c4a05e913dc7abbb88a8

commit | commitdiff | tree

Tom O'Neill [Mon, 18 May 2015 21:13:29 +0000 (14:13 -0700)]

LocationSettings javadoc describes what's in the UI

- In particular, tells OEMs how to add their own settings

Change-Id: I45e4fb7ff59705a2bcb53a72c71fd230f2e085c5

commit | commitdiff | tree

Sanket Padawe [Mon, 18 May 2015 21:10:23 +0000 (21:10 +0000)]

am 7186a47e: Check for special char when renaming device for Wi-Fi direct.

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

commit | commitdiff | tree

Xiyuan Xia [Fri, 15 May 2015 20:37:04 +0000 (13:37 -0700)]

No input instead of disabling password/pin entry

So that the keyboard does not come and go all the time.

Bug:21271425
Change-Id: If73109fca1417c43307dc6069307789031ffc607

commit | commitdiff | tree

Sanket Padawe [Mon, 18 May 2015 18:39:01 +0000 (11:39 -0700)]

Check for special char when renaming device for Wi-Fi direct.

Bug: 21141820
Change-Id: I78231d95e5ba3f505325d5657f8e6106a887f11e

commit | commitdiff | tree

Robin Lee [Mon, 18 May 2015 09:10:30 +0000 (10:10 +0100)]

Badge managed WiFi networks

Bug: 19504806
Change-Id: I600b41e4bf6d336b7e091968560c6393041fc6b2

commit | commitdiff | tree

Jason Monk [Mon, 18 May 2015 13:59:06 +0000 (13:59 +0000)]

am b50875d9: am 6dbb9ff0: am bbf031ab: Merge "Try not to crash while AppInfo is finishing" into mnc-dev

* commit 'b50875d9156c7542e93c28e4aa8995fc4c5ed52a':
Try not to crash while AppInfo is finishing

commit | commitdiff | tree

Jason Monk [Mon, 18 May 2015 13:47:17 +0000 (13:47 +0000)]

am 6dbb9ff0: am bbf031ab: Merge "Try not to crash while AppInfo is finishing" into mnc-dev

* commit '6dbb9ff05969e708c25ef1af9ba45e23c6a51afe':
Try not to crash while AppInfo is finishing

commit | commitdiff | tree

Jason Monk [Mon, 18 May 2015 13:34:56 +0000 (13:34 +0000)]

am bbf031ab: Merge "Try not to crash while AppInfo is finishing" into mnc-dev

* commit 'bbf031ab09b445964acb5e7356ba407dd3dc2d33':
Try not to crash while AppInfo is finishing

commit | commitdiff | tree

Jason Monk [Mon, 18 May 2015 13:28:02 +0000 (13:28 +0000)]

Merge "Try not to crash while AppInfo is finishing" into mnc-dev

commit | commitdiff | tree

The Android Automerger [Mon, 18 May 2015 08:02:32 +0000 (01:02 -0700)]

merge in mnc-release history after reset to mnc-dev

commit | commitdiff | tree

Svet Ganov [Sun, 17 May 2015 11:49:09 +0000 (11:49 +0000)]

am 9027bc2f: am 9a3ad8a3: am 67e067ff: Hide platform platform legacy permissions behind a menu option - settings.

* commit '9027bc2f2dbdf1763238843cc7098eafb04c56d0':
Hide platform platform legacy permissions behind a menu option - settings.

commit | commitdiff | tree

Svet Ganov [Sun, 17 May 2015 11:40:15 +0000 (11:40 +0000)]

am 9a3ad8a3: am 67e067ff: Hide platform platform legacy permissions behind a menu option - settings.

* commit '9a3ad8a36bd7eb7453f532746aa92189404df01a':
Hide platform platform legacy permissions behind a menu option - settings.

commit | commitdiff | tree

Svet Ganov [Sun, 17 May 2015 11:23:50 +0000 (11:23 +0000)]

am 67e067ff: Hide platform platform legacy permissions behind a menu option - settings.

* commit '67e067fff4e4ef1eb54f9c238dbf07312434a07e':
Hide platform platform legacy permissions behind a menu option - settings.

commit | commitdiff | tree

Svet Ganov [Sun, 17 May 2015 05:59:38 +0000 (22:59 -0700)]

Hide platform platform legacy permissions behind a menu option - settings.

bug:21195624

Change-Id: Ib1dcfe2a15685c36e2a59e0921ea74d46ec9738c

commit | commitdiff | tree

The Android Automerger [Sat, 16 May 2015 08:03:47 +0000 (01:03 -0700)]

merge in mnc-release history after reset to mnc-dev

commit | commitdiff | tree

Jeff Sharkey [Fri, 15 May 2015 22:33:00 +0000 (22:33 +0000)]

am 47b3d7c6: am 1661f00a: am 11b29e76: Merge "Initial pass at storage benchmarks." into mnc-dev

* commit '47b3d7c6f58cedadf8cd9c96ddd0ea83059c9225':
Initial pass at storage benchmarks.

commit | commitdiff | tree

Jeff Sharkey [Fri, 15 May 2015 22:22:22 +0000 (22:22 +0000)]

am 1661f00a: am 11b29e76: Merge "Initial pass at storage benchmarks." into mnc-dev

* commit '1661f00ae06aa773a0c308a558fd44bc7b1db877':
Initial pass at storage benchmarks.

commit | commitdiff | tree

Jason Monk [Fri, 15 May 2015 15:35:45 +0000 (11:35 -0400)]

Banish the memory page to Apps > Advanced

Bug: 21129029
Change-Id: I5ea6c88505e553a4340e9c60377952af7e802a44

commit | commitdiff | tree

Jeff Sharkey [Fri, 15 May 2015 22:08:47 +0000 (22:08 +0000)]

am 11b29e76: Merge "Initial pass at storage benchmarks." into mnc-dev

* commit '11b29e7613a30610981d56786fd5d2e0b7494aab':
Initial pass at storage benchmarks.

commit | commitdiff | tree

Jeff Sharkey [Fri, 15 May 2015 21:55:51 +0000 (21:55 +0000)]

Merge "Initial pass at storage benchmarks." into mnc-dev

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 15 May 2015 20:55:33 +0000 (20:55 +0000)]

am a5ddfd4b: am eba12083: am cb5444ad: Merge "Reflect Wifi config lockdown restriction in Settings" into mnc-dev

* commit 'a5ddfd4b6d818a611a942cdeb0dcd0fb1c169f2e':
Reflect Wifi config lockdown restriction in Settings

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 15 May 2015 20:43:56 +0000 (20:43 +0000)]

am eba12083: am cb5444ad: Merge "Reflect Wifi config lockdown restriction in Settings" into mnc-dev

* commit 'eba12083bf3cced3d0f9c75efcc96fd130314a5f':
Reflect Wifi config lockdown restriction in Settings

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 15 May 2015 20:31:58 +0000 (20:31 +0000)]

am cb5444ad: Merge "Reflect Wifi config lockdown restriction in Settings" into mnc-dev

* commit 'cb5444ad2ccf2f16bddafb8844cde6a1a92adddb':
Reflect Wifi config lockdown restriction in Settings

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 15 May 2015 20:22:34 +0000 (20:22 +0000)]

Merge "Reflect Wifi config lockdown restriction in Settings" into mnc-dev

commit | commitdiff | tree

Jason Monk [Fri, 15 May 2015 17:05:46 +0000 (13:05 -0400)]

Try not to crash while AppInfo is finishing

Bug: 21025020
Change-Id: Iebb9e6b24ca503f87b5648f0aaf02dde01903488

commit | commitdiff | tree

Jason Monk [Fri, 15 May 2015 16:57:13 +0000 (16:57 +0000)]

am 70842a4e: am 1f7861b6: am 0c0e35ef: Banish the memory page to Apps > Advanced

* commit '70842a4e3b5160df0dd496e909e19516ec09e406':
Banish the memory page to Apps > Advanced

commit | commitdiff | tree

Jason Monk [Fri, 15 May 2015 16:37:56 +0000 (16:37 +0000)]

am 1f7861b6: am 0c0e35ef: Banish the memory page to Apps > Advanced

* commit '1f7861b608e49c3336ffe14a074063559e0e0aa7':
Banish the memory page to Apps > Advanced

commit | commitdiff | tree

Jason Monk [Fri, 15 May 2015 16:26:33 +0000 (16:26 +0000)]

am 0c0e35ef: Banish the memory page to Apps > Advanced

* commit '0c0e35ef3008e3b2c8c67d7454cbe46d3d848625':
Banish the memory page to Apps > Advanced

commit | commitdiff | tree

Jason Monk [Fri, 15 May 2015 15:35:45 +0000 (11:35 -0400)]

Banish the memory page to Apps > Advanced

Bug: 21129029
Change-Id: I5ea6c88505e553a4340e9c60377952af7e802a44

commit | commitdiff | tree

Jeff Sharkey [Fri, 15 May 2015 04:08:48 +0000 (21:08 -0700)]

Initial pass at storage benchmarks.

After adopting a disk, run benchmarks to compare its performance
against internal storage.

Bug: 21172095
Change-Id: I7c9a5a89e37f7156677fc76bd1ba193eead6665e

commit | commitdiff | tree

Matthew Williams [Fri, 15 May 2015 02:39:24 +0000 (02:39 +0000)]

am fe5d0d9b: am 8c5d3889: am 5af3d6f5: Add strings for fullbackup data erase confirmation

* commit 'fe5d0d9b67ff33f88a924c7231b564bc7d7e7be6':
Add strings for fullbackup data erase confirmation

commit | commitdiff | tree

Matthew Williams [Fri, 15 May 2015 02:28:36 +0000 (02:28 +0000)]

am 8c5d3889: am 5af3d6f5: Add strings for fullbackup data erase confirmation

* commit '8c5d388922812ee1063ab0603f68f8c2e1faecd5':
Add strings for fullbackup data erase confirmation

commit | commitdiff | tree

Matthew Williams [Fri, 15 May 2015 02:17:52 +0000 (02:17 +0000)]

am 5af3d6f5: Add strings for fullbackup data erase confirmation

* commit '5af3d6f5cb95d654b963eae94155285e4e23a97e':
Add strings for fullbackup data erase confirmation

commit | commitdiff | tree

Matthew Williams [Fri, 15 May 2015 01:57:32 +0000 (18:57 -0700)]

Add strings for fullbackup data erase confirmation

Added a new string called fullbackup_erase_dialog_message which
will be displayed when the user has seen the "opted into dolly"
text.
Old string remains in place for the case where the user
hasn't seen the text.
BUG: 20489775

Change-Id: Id6675d1510cf1598f84fdfdcda7f6502a6cf6715

commit | commitdiff | tree

Jorim Jaggi [Wed, 13 May 2015 21:14:05 +0000 (14:14 -0700)]

Fix crash when removing fingerprint

Also fix a strings in fingerprint enrollment.

Bug: 21030545
Change-Id: I2d250b51a01f02bee014d4bc8e192d11199113e3

commit | commitdiff | tree

Svet Ganov [Fri, 15 May 2015 00:07:27 +0000 (00:07 +0000)]

am 588faa33: am def90c56: am 3bd7db9f: Merge "Fix a typo." into mnc-dev

* commit '588faa3353965c6fa1670122b58060783b347d5a':
Fix a typo.

commit | commitdiff | tree

Svet Ganov [Thu, 14 May 2015 23:54:50 +0000 (23:54 +0000)]

am def90c56: am 3bd7db9f: Merge "Fix a typo." into mnc-dev

* commit 'def90c568c5787a83052554bc8c0ed7e00896fee':
Fix a typo.

commit | commitdiff | tree

Svet Ganov [Thu, 14 May 2015 23:45:35 +0000 (23:45 +0000)]

am 3bd7db9f: Merge "Fix a typo." into mnc-dev

* commit '3bd7db9f85a27f98f59b254764a41914905020d7':
Fix a typo.

commit | commitdiff | tree

Svet Ganov [Thu, 14 May 2015 23:29:27 +0000 (23:29 +0000)]