Jeff Sharkey
719d0ad904
am d0393cd0: Merge "Warn user when adopted device is slow." into mnc-dev
...
* commit 'd0393cd0417ecc8aed686578381745a88fb77f92':
Warn user when adopted device is slow.
2015-05-19 19:10:53 +00:00
Jeff Sharkey
d0393cd041
Merge "Warn user when adopted device is slow." into mnc-dev
2015-05-19 19:03:35 +00:00
Jeff Sharkey
0de2014380
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
2015-05-19 12:00:56 -07:00
Robin Lee
148c327fb3
am 4dda36a2: am 7526238a: am 196d0543: Merge "Badge managed WiFi networks" into mnc-dev
...
* commit '4dda36a220ee646e4a22bd2d6f44be5b1c6d568b':
Badge managed WiFi networks
2015-05-19 13:53:50 +00:00
Robin Lee
4dda36a220
am 7526238a: am 196d0543: Merge "Badge managed WiFi networks" into mnc-dev
...
* commit '7526238a74fe4565a8ed2c29b43e8535650fb4b1':
Badge managed WiFi networks
2015-05-19 13:42:54 +00:00
Robin Lee
7526238a74
am 196d0543: Merge "Badge managed WiFi networks" into mnc-dev
...
* commit '196d0543737cef8fcf5e193af688a093a3743597':
Badge managed WiFi networks
2015-05-19 13:31:37 +00:00
Robin Lee
196d054373
Merge "Badge managed WiFi networks" into mnc-dev
2015-05-19 13:22:10 +00:00
Jorim Jaggi
82ac6fa4e3
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
2015-05-19 05:14:01 +00:00
Jorim Jaggi
65e43332cc
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
2015-05-19 05:02:24 +00:00
Jorim Jaggi
a351cda36e
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
2015-05-19 04:51:08 +00:00
Jorim Jaggi
a2138a3485
Merge "Add setting to disable assist data (2/2)." into mnc-dev
2015-05-19 04:40:10 +00:00
Jorim Jaggi
bc38a9a0ab
Add setting to disable assist data (2/2).
...
Bug: 20944446
Change-Id: I3c518176cab88ce9b5031a0241bee30240e6f896
2015-05-18 21:38:45 -07:00
Matthew Williams
7d20fc8bf8
am aa64ba55: am 9d2edaf2: am 6ee5a4d0: Update Backup/reset UI
...
* commit 'aa64ba5550a7d886db6772a180b563be5e706da1':
Update Backup/reset UI
2015-05-19 01:54:47 +00:00
Matthew Williams
aa64ba5550
am 9d2edaf2: am 6ee5a4d0: Update Backup/reset UI
...
* commit '9d2edaf2bcd9e2a52e9092e40619d171847e84ee':
Update Backup/reset UI
2015-05-19 01:41:38 +00:00
Matthew Williams
9d2edaf2bc
am 6ee5a4d0: Update Backup/reset UI
...
* commit '6ee5a4d0ef0386d56c72a8ae81e65443fe5a2979':
Update Backup/reset UI
2015-05-19 01:31:47 +00:00
Matthew Williams
6ee5a4d0ef
Update Backup/reset UI
...
BUG: 20489775
Change-Id: I2c97fdf240ddd3e9f0a518478d5da91b91abe394
2015-05-18 18:16:09 -07:00
xinhe
a017e012f3
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
2015-05-18 22:00:28 +00:00
xinhe
01451c89e1
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
2015-05-18 21:46:54 +00:00
xinhe
43e257381c
am 512bb7e2: Merge "Rename config AP Band for Select AP Band" into mnc-dev
...
* commit '512bb7e2e37512e22a466942dc7344dc12439648':
Rename config AP Band for Select AP Band
2015-05-18 21:33:49 +00:00
xinhe
baf4dab3a8
Rename config AP Band for Select AP Band
...
Bug:19095100
Change-Id: I18af303a56cf81b2a113c4a05e913dc7abbb88a8
2015-05-18 14:19:58 -07:00
Robin Lee
9aaee290ad
Badge managed WiFi networks
...
Bug: 19504806
Change-Id: I600b41e4bf6d336b7e091968560c6393041fc6b2
2015-05-18 18:42:36 +01:00
Svet Ganov
7607ab8262
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.
2015-05-17 11:49:09 +00:00
Svet Ganov
9027bc2f2d
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.
2015-05-17 11:40:15 +00:00
Svet Ganov
9a3ad8a36b
am 67e067ff: Hide platform platform legacy permissions behind a menu option - settings.
...
* commit '67e067fff4e4ef1eb54f9c238dbf07312434a07e':
Hide platform platform legacy permissions behind a menu option - settings.
2015-05-17 11:23:50 +00:00
Svet Ganov
67e067fff4
Hide platform platform legacy permissions behind a menu option - settings.
...
bug:21195624
Change-Id: Ib1dcfe2a15685c36e2a59e0921ea74d46ec9738c
2015-05-16 22:59:41 -07: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
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
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
Jorim Jaggi
68d208e903
Merge "Fix crash when removing fingerprint" into mnc-dev
2015-05-14 22:12:38 +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
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
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
Sanket Padawe
b331c3937d
Merge "Hotspot 2.0 UI for saved network." into mnc-dev
2015-05-14 02:40:40 +00:00
Geoff Mendal
ecac0e5590
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-05-14 02:35:42 +00:00
Geoff Mendal
1760c0a34d
Import translations. DO NOT MERGE
...
Change-Id: I9ef3b09a81c284f0bdeb0493ce73616d10fca3c3
Auto-generated-cl: translation import
2015-05-13 19:27:55 -07:00
Amith Yamasani
50e32b0db0
Developer settings screen for inactive apps
...
Show a list of apps and allow toggling their active state.
Bug: 20066058
Change-Id: Id81e95c354a579773d39d3e7d7cfa1ff46df29e9
2015-05-13 18:23:20 -07:00