Commit Graph

20386 Commits

Author SHA1 Message Date
Jeff Sharkey
8a4b6714af am 47b3d7c6: am 1661f00a: am 11b29e76: Merge "Initial pass at storage benchmarks." into mnc-dev
* commit '47b3d7c6f58cedadf8cd9c96ddd0ea83059c9225':
  Initial pass at storage benchmarks.
2015-05-15 22:33:00 +00:00
Jeff Sharkey
47b3d7c6f5 am 1661f00a: am 11b29e76: Merge "Initial pass at storage benchmarks." into mnc-dev
* commit '1661f00ae06aa773a0c308a558fd44bc7b1db877':
  Initial pass at storage benchmarks.
2015-05-15 22:22:22 +00:00
Jeff Sharkey
1661f00ae0 am 11b29e76: Merge "Initial pass at storage benchmarks." into mnc-dev
* commit '11b29e7613a30610981d56786fd5d2e0b7494aab':
  Initial pass at storage benchmarks.
2015-05-15 22:08:47 +00:00
Jeff Sharkey
11b29e7613 Merge "Initial pass at storage benchmarks." into mnc-dev 2015-05-15 21:56:01 +00:00
Zoltan Szatmary-Ban
3db1003f09 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
2015-05-15 20:55:33 +00:00
Zoltan Szatmary-Ban
a5ddfd4b6d am eba12083: am cb5444ad: Merge "Reflect Wifi config lockdown restriction in Settings" into mnc-dev
* commit 'eba12083bf3cced3d0f9c75efcc96fd130314a5f':
  Reflect Wifi config lockdown restriction in Settings
2015-05-15 20:43:56 +00:00
Zoltan Szatmary-Ban
eba12083bf am cb5444ad: Merge "Reflect Wifi config lockdown restriction in Settings" into mnc-dev
* commit 'cb5444ad2ccf2f16bddafb8844cde6a1a92adddb':
  Reflect Wifi config lockdown restriction in Settings
2015-05-15 20:31:58 +00:00
Zoltan Szatmary-Ban
cb5444ad2c Merge "Reflect Wifi config lockdown restriction in Settings" into mnc-dev 2015-05-15 20:22:34 +00:00
Jason Monk
ec90a59413 am 70842a4e: am 1f7861b6: am 0c0e35ef: Banish the memory page to Apps > Advanced
* commit '70842a4e3b5160df0dd496e909e19516ec09e406':
  Banish the memory page to Apps > Advanced
2015-05-15 16:57:13 +00:00
Jason Monk
70842a4e3b am 1f7861b6: am 0c0e35ef: Banish the memory page to Apps > Advanced
* commit '1f7861b608e49c3336ffe14a074063559e0e0aa7':
  Banish the memory page to Apps > Advanced
2015-05-15 16:37:56 +00:00
Jason Monk
1f7861b608 am 0c0e35ef: Banish the memory page to Apps > Advanced
* commit '0c0e35ef3008e3b2c8c67d7454cbe46d3d848625':
  Banish the memory page to Apps > Advanced
2015-05-15 16:26:33 +00:00
Jason Monk
0c0e35ef30 Banish the memory page to Apps > Advanced
Bug: 21129029
Change-Id: I5ea6c88505e553a4340e9c60377952af7e802a44
2015-05-15 11:37:42 -04:00
Jeff Sharkey
58003515ca Initial pass at storage benchmarks.
After adopting a disk, run benchmarks to compare its performance
against internal storage.

Bug: 21172095
Change-Id: I7c9a5a89e37f7156677fc76bd1ba193eead6665e
2015-05-14 21:08:50 -07:00
Matthew Williams
a790557431 am fe5d0d9b: am 8c5d3889: am 5af3d6f5: Add strings for fullbackup data erase confirmation
* commit 'fe5d0d9b67ff33f88a924c7231b564bc7d7e7be6':
  Add strings for fullbackup data erase confirmation
2015-05-15 02:39:24 +00:00
Matthew Williams
fe5d0d9b67 am 8c5d3889: am 5af3d6f5: Add strings for fullbackup data erase confirmation
* commit '8c5d388922812ee1063ab0603f68f8c2e1faecd5':
  Add strings for fullbackup data erase confirmation
2015-05-15 02:28:36 +00:00
Matthew Williams
8c5d388922 am 5af3d6f5: Add strings for fullbackup data erase confirmation
* commit '5af3d6f5cb95d654b963eae94155285e4e23a97e':
  Add strings for fullbackup data erase confirmation
2015-05-15 02:17:52 +00:00
Matthew Williams
5af3d6f5cb 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
2015-05-14 18:57:32 -07:00
Svet Ganov
2c44100fdc am 588faa33: am def90c56: am 3bd7db9f: Merge "Fix a typo." into mnc-dev
* commit '588faa3353965c6fa1670122b58060783b347d5a':
  Fix a typo.
2015-05-15 00:07:27 +00:00
Svet Ganov
588faa3353 am def90c56: am 3bd7db9f: Merge "Fix a typo." into mnc-dev
* commit 'def90c568c5787a83052554bc8c0ed7e00896fee':
  Fix a typo.
2015-05-14 23:54:50 +00:00
Svet Ganov
def90c568c am 3bd7db9f: Merge "Fix a typo." into mnc-dev
* commit '3bd7db9f85a27f98f59b254764a41914905020d7':
  Fix a typo.
2015-05-14 23:45:35 +00:00
Svet Ganov
3bd7db9f85 Merge "Fix a typo." into mnc-dev 2015-05-14 23:29:27 +00:00
Svet Ganov
280e59f1fb Fix a typo.
Change-Id: I38855b1f83d2524ff76b78a3109f18e128d803e1
2015-05-14 16:27:51 -07:00
Jorim Jaggi
bf373fddda am e1fa322d: am 7dc5d2c0: am 68d208e9: Merge "Fix crash when removing fingerprint" into mnc-dev
* commit 'e1fa322dec6a179abb48192135cf3ae3c00c1ee6':
  Fix crash when removing fingerprint
2015-05-14 22:40:36 +00:00
Jorim Jaggi
e1fa322dec am 7dc5d2c0: am 68d208e9: Merge "Fix crash when removing fingerprint" into mnc-dev
* commit '7dc5d2c044e07730784a5897e74ea6e696a43bbc':
  Fix crash when removing fingerprint
2015-05-14 22:28:27 +00:00
Jorim Jaggi
7dc5d2c044 am 68d208e9: Merge "Fix crash when removing fingerprint" into mnc-dev
* commit '68d208e9034a1e547d752a76f67a72680e380d07':
  Fix crash when removing fingerprint
2015-05-14 22:20:33 +00:00
Fabrice Di Meglio
df83765307 am 41f6869a: am a9af1d26: am 3fc7bfd9: Merge "Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException" into mnc-dev
* commit '41f6869a8c36357db181cfb0843aaa518a74c1a8':
  Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
2015-05-14 22:15:52 +00:00
Jorim Jaggi
68d208e903 Merge "Fix crash when removing fingerprint" into mnc-dev 2015-05-14 22:12:38 +00:00
Fabrice Di Meglio
41f6869a8c am a9af1d26: am 3fc7bfd9: Merge "Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException" into mnc-dev
* commit 'a9af1d262cbf5c26a57b4028d57b4053c29fdce6':
  Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
2015-05-14 22:01:52 +00:00
Fabrice Di Meglio
a9af1d262c am 3fc7bfd9: Merge "Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException" into mnc-dev
* commit '3fc7bfd9d9a4aa5b89b714ef18385366fde2b946':
  Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
2015-05-14 21:51:07 +00:00
Fabrice Di Meglio
3fc7bfd9d9 Merge "Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException" into mnc-dev 2015-05-14 21:40:53 +00:00
Fabrice Di Meglio
ae35e0c013 Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
- prevent the NPE

Change-Id: Ief5a618e789e50eebcaa4386bd9ecec2192b4565
2015-05-14 14:31:41 -07:00
Amith Yamasani
ccf1bc452f am 1e37bb87: am 7ca7645c: am fd210786: Fix build
* commit '1e37bb877c180dbc990b43a18e41b27a6970eb39':
  Fix build
2015-05-14 06:53:58 +00:00
Geoff Mendal
a1a04762ec am 1026407e: (-s ours) am bbc090f0: (-s ours) am 78004ec6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '1026407eeb8d630b992a7ccba18d1d9f52083fa9':
  Import translations. DO NOT MERGE
2015-05-14 06:53:57 +00:00
Amith Yamasani
6abc73dac9 am 0b8864ef: am 2fcfcd4f: am 0327d483: Merge "Developer settings screen for inactive apps" into mnc-dev
* commit '0b8864effdbf24e187e2db21b34f4a3c09c825fe':
  Developer settings screen for inactive apps
2015-05-14 06:53:56 +00:00
Sanket Padawe
8378487f48 am ec422334: am 0c3ce4e4: am b331c393: Merge "Hotspot 2.0 UI for saved network." into mnc-dev
* commit 'ec42233484d7648f51ffe5c49c51b33beb735b29':
  Hotspot 2.0 UI for saved network.
2015-05-14 06:53:55 +00:00
Geoff Mendal
a6662b084b am 4472e4af: (-s ours) am e17a1128: (-s ours) am ecac0e55: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '4472e4af82268b1c64f4a5bb1318161114f960af':
  Import translations. DO NOT MERGE
2015-05-14 06:53:53 +00:00
Amith Yamasani
1e37bb877c am 7ca7645c: am fd210786: Fix build
* commit '7ca7645cc0494e047a4b831a3877d4b4c81acaa9':
  Fix build
2015-05-14 06:40:07 +00:00
Geoff Mendal
1026407eeb am bbc090f0: (-s ours) am 78004ec6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'bbc090f02296b9faa8813c75886485f48d84d0eb':
  Import translations. DO NOT MERGE
2015-05-14 06:39:46 +00:00
Amith Yamasani
0b8864effd am 2fcfcd4f: am 0327d483: Merge "Developer settings screen for inactive apps" into mnc-dev
* commit '2fcfcd4f1db03e0052f479597c7359d0071d4ac4':
  Developer settings screen for inactive apps
2015-05-14 06:39:43 +00:00
Sanket Padawe
ec42233484 am 0c3ce4e4: am b331c393: Merge "Hotspot 2.0 UI for saved network." into mnc-dev
* commit '0c3ce4e4bd503af6f48cb7b109c1301efc149c47':
  Hotspot 2.0 UI for saved network.
2015-05-14 06:38:08 +00:00
Geoff Mendal
4472e4af82 am e17a1128: (-s ours) am ecac0e55: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'e17a11284ce3b093c9baf40e057f0327d1d4060f':
  Import translations. DO NOT MERGE
2015-05-14 06:38:07 +00:00
Amith Yamasani
7ca7645cc0 am fd210786: Fix build
* commit 'fd210786eab8c4aacbbb3aad5a206c57a732d2dc':
  Fix build
2015-05-14 04:48:38 +00:00
Amith Yamasani
fd210786ea Fix build
Change-Id: Id5c76cc0c9ead630d345a4ce173e3e9d141c1af9
2015-05-13 21:37:51 -07:00
Geoff Mendal
bbc090f022 am 78004ec6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '78004ec621e082e660a53c48ed4c06ed380764c7':
  Import translations. DO NOT MERGE
2015-05-14 04:18:23 +00:00
Geoff Mendal
78004ec621 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-14 04:14:08 +00:00
Amith Yamasani
2fcfcd4f1d am 0327d483: Merge "Developer settings screen for inactive apps" into mnc-dev
* commit '0327d483068e0ae286540e6315e6b32a98fbb41c':
  Developer settings screen for inactive apps
2015-05-14 04:14:06 +00:00
Geoff Mendal
07803c0bfe Import translations. DO NOT MERGE
Change-Id: Ia831500abc9de4dd293c116e0a81f4bcccad0672
Auto-generated-cl: translation import
2015-05-13 21:12:10 -07:00
Amith Yamasani
0327d48306 Merge "Developer settings screen for inactive apps" into mnc-dev 2015-05-14 04:04:55 +00:00
Sanket Padawe
0c3ce4e4bd am b331c393: Merge "Hotspot 2.0 UI for saved network." into mnc-dev
* commit 'b331c3937d07d44354bf882ae0e30e77aef9e875':
  Hotspot 2.0 UI for saved network.
2015-05-14 02:43:40 +00:00
Geoff Mendal
e17a11284c am ecac0e55: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'ecac0e55906082fd1d1e65554a87625179ba7445':
  Import translations. DO NOT MERGE
2015-05-14 02:43:38 +00:00