OSDN Git Service
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
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
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
Robin Lee [Tue, 19 May 2015 10:14:55 +0000 (10:14 +0000)]
Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev
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
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
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
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
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
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
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
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
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
Matthew Williams [Sat, 16 May 2015 04:14:14 +0000 (21:14 -0700)]
Update Backup/reset UI
BUG:
20489775
Change-Id: I2c97fdf240ddd3e9f0a518478d5da91b91abe394
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
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
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
xinhe [Mon, 18 May 2015 22:00:28 +0000 (22:00 +0000)]
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
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
xinhe [Mon, 18 May 2015 21:46:54 +0000 (21:46 +0000)]
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
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.
xinhe [Mon, 18 May 2015 21:33:49 +0000 (21:33 +0000)]
am
512bb7e2: Merge "Rename config AP Band for Select AP Band" into mnc-dev
* commit '
512bb7e2e37512e22a466942dc7344dc12439648':
Rename config AP Band for Select AP Band
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
xinhe [Mon, 18 May 2015 21:22:08 +0000 (21:22 +0000)]
Merge "Rename config AP Band for Select AP Band" into mnc-dev
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.
xinhe [Mon, 18 May 2015 21:19:58 +0000 (14:19 -0700)]
Rename config AP Band for Select AP Band
Bug:
19095100
Change-Id: I18af303a56cf81b2a113c4a05e913dc7abbb88a8
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
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.
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
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
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
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
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
The Android Automerger [Mon, 18 May 2015 08:02:32 +0000 (01:02 -0700)]
merge in mnc-release history after reset to mnc-dev
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.
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.
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.
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
The Android Automerger [Sat, 16 May 2015 08:03:47 +0000 (01:03 -0700)]
merge in mnc-release history after reset to mnc-dev
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.
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.
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
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.
Jeff Sharkey [Fri, 15 May 2015 21:55:51 +0000 (21:55 +0000)]
Merge "Initial pass at storage benchmarks." into mnc-dev
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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.
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.
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.
Svet Ganov [Thu, 14 May 2015 23:29:27 +0000 (23:29 +0000)]
Merge "Fix a typo." into mnc-dev
Svet Ganov [Thu, 14 May 2015 23:27:46 +0000 (16:27 -0700)]
Fix a typo.
Change-Id: I38855b1f83d2524ff76b78a3109f18e128d803e1
Jorim Jaggi [Thu, 14 May 2015 22:40:36 +0000 (22:40 +0000)]
am
e1fa322d: am
7dc5d2c0: am
68d208e9: Merge "Fix crash when removing fingerprint" into mnc-dev
* commit '
e1fa322dec6a179abb48192135cf3ae3c00c1ee6':
Fix crash when removing fingerprint
Jorim Jaggi [Thu, 14 May 2015 22:28:27 +0000 (22:28 +0000)]
am
7dc5d2c0: am
68d208e9: Merge "Fix crash when removing fingerprint" into mnc-dev
* commit '
7dc5d2c044e07730784a5897e74ea6e696a43bbc':
Fix crash when removing fingerprint
Jorim Jaggi [Thu, 14 May 2015 22:20:33 +0000 (22:20 +0000)]
am
68d208e9: Merge "Fix crash when removing fingerprint" into mnc-dev
* commit '
68d208e9034a1e547d752a76f67a72680e380d07':
Fix crash when removing fingerprint
Fabrice Di Meglio [Thu, 14 May 2015 22:15:52 +0000 (22:15 +0000)]
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
Jorim Jaggi [Thu, 14 May 2015 22:12:38 +0000 (22:12 +0000)]
Merge "Fix crash when removing fingerprint" into mnc-dev
Fabrice Di Meglio [Thu, 14 May 2015 22:01:52 +0000 (22:01 +0000)]
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
Fabrice Di Meglio [Thu, 14 May 2015 21:51:07 +0000 (21:51 +0000)]
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
Fabrice Di Meglio [Thu, 14 May 2015 21:20:45 +0000 (14:20 -0700)]
Fix bug #
21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
- prevent the NPE
Change-Id: Ief5a618e789e50eebcaa4386bd9ecec2192b4565
Fabrice Di Meglio [Thu, 14 May 2015 21:40:52 +0000 (21:40 +0000)]
Merge "Fix bug #
21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException" into mnc-dev
Fabrice Di Meglio [Thu, 14 May 2015 21:20:45 +0000 (14:20 -0700)]
Fix bug #
21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
- prevent the NPE
Change-Id: Ief5a618e789e50eebcaa4386bd9ecec2192b4565
Amith Yamasani [Thu, 14 May 2015 06:53:58 +0000 (06:53 +0000)]
Geoff Mendal [Thu, 14 May 2015 06:53:57 +0000 (06:53 +0000)]
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
Amith Yamasani [Thu, 14 May 2015 06:53:56 +0000 (06:53 +0000)]
am
0b8864ef: am
2fcfcd4f: am
0327d483: Merge "Developer settings screen for inactive apps" into mnc-dev
* commit '
0b8864effdbf24e187e2db21b34f4a3c09c825fe':
Developer settings screen for inactive apps
Sanket Padawe [Thu, 14 May 2015 06:53:55 +0000 (06:53 +0000)]
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.
Geoff Mendal [Thu, 14 May 2015 06:53:53 +0000 (06:53 +0000)]
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
Amith Yamasani [Thu, 14 May 2015 06:40:07 +0000 (06:40 +0000)]
Geoff Mendal [Thu, 14 May 2015 06:39:46 +0000 (06:39 +0000)]
am
bbc090f0: (-s ours) am
78004ec6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
bbc090f02296b9faa8813c75886485f48d84d0eb':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 14 May 2015 06:39:43 +0000 (06:39 +0000)]
am
2fcfcd4f: am
0327d483: Merge "Developer settings screen for inactive apps" into mnc-dev
* commit '
2fcfcd4f1db03e0052f479597c7359d0071d4ac4':
Developer settings screen for inactive apps
Sanket Padawe [Thu, 14 May 2015 06:38:08 +0000 (06:38 +0000)]
am
0c3ce4e4: am
b331c393: Merge "Hotspot 2.0 UI for saved network." into mnc-dev
* commit '
0c3ce4e4bd503af6f48cb7b109c1301efc149c47':
Hotspot 2.0 UI for saved network.
Geoff Mendal [Thu, 14 May 2015 06:38:07 +0000 (06:38 +0000)]
am
e17a1128: (-s ours) am
ecac0e55: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e17a11284ce3b093c9baf40e057f0327d1d4060f':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 14 May 2015 04:48:38 +0000 (04:48 +0000)]
Amith Yamasani [Thu, 14 May 2015 04:37:51 +0000 (21:37 -0700)]
Fix build
Change-Id: Id5c76cc0c9ead630d345a4ce173e3e9d141c1af9
Geoff Mendal [Thu, 14 May 2015 04:18:23 +0000 (04:18 +0000)]
am
78004ec6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
78004ec621e082e660a53c48ed4c06ed380764c7':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 14 May 2015 04:14:07 +0000 (04:14 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Amith Yamasani [Thu, 14 May 2015 04:14:06 +0000 (04:14 +0000)]
am
0327d483: Merge "Developer settings screen for inactive apps" into mnc-dev
* commit '
0327d483068e0ae286540e6315e6b32a98fbb41c':
Developer settings screen for inactive apps
Geoff Mendal [Thu, 14 May 2015 04:12:10 +0000 (21:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia831500abc9de4dd293c116e0a81f4bcccad0672
Auto-generated-cl: translation import
Amith Yamasani [Thu, 14 May 2015 04:04:54 +0000 (04:04 +0000)]
Merge "Developer settings screen for inactive apps" into mnc-dev
Sanket Padawe [Thu, 14 May 2015 02:43:40 +0000 (02:43 +0000)]
am
b331c393: Merge "Hotspot 2.0 UI for saved network." into mnc-dev
* commit '
b331c3937d07d44354bf882ae0e30e77aef9e875':
Hotspot 2.0 UI for saved network.
Geoff Mendal [Thu, 14 May 2015 02:43:38 +0000 (02:43 +0000)]
am
ecac0e55: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
ecac0e55906082fd1d1e65554a87625179ba7445':
Import translations. DO NOT MERGE
Sanket Padawe [Thu, 14 May 2015 02:40:36 +0000 (02:40 +0000)]
Merge "Hotspot 2.0 UI for saved network." into mnc-dev
Geoff Mendal [Thu, 14 May 2015 02:35:41 +0000 (02:35 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 14 May 2015 02:27:55 +0000 (19:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9ef3b09a81c284f0bdeb0493ce73616d10fca3c3
Auto-generated-cl: translation import
Amith Yamasani [Thu, 14 May 2015 01:18:16 +0000 (18:18 -0700)]
Developer settings screen for inactive apps
Show a list of apps and allow toggling their active state.
Bug:
20066058
Change-Id: Id81e95c354a579773d39d3e7d7cfa1ff46df29e9
Svet Ganov [Thu, 14 May 2015 00:56:15 +0000 (00:56 +0000)]
am
afadcacf: am
9c083c55: am
f96bcb41: Merge "Access mock location is no longer a runtime permission - settings" into mnc-dev
* commit '
afadcacfa0b420611cc2108099232e9b953983b1':
Access mock location is no longer a runtime permission - settings
Svet Ganov [Thu, 14 May 2015 00:43:27 +0000 (00:43 +0000)]
am
9c083c55: am
f96bcb41: Merge "Access mock location is no longer a runtime permission - settings" into mnc-dev
* commit '
9c083c5597d4096e48a0202d2a0682d56951d78f':
Access mock location is no longer a runtime permission - settings
Zoltan Szatmary-Ban [Thu, 14 May 2015 00:40:48 +0000 (01:40 +0100)]
Reflect Wifi config lockdown restriction in Settings
DO created WiFi configurations are now only locked down
for editing/removing if DISALLOW_CONFIG_WIFI is not set.
This needed to be reflected on Settings UI.
Bug:
20719934
Change-Id: Ibd218821ab46cca8396084e2d73ae5ee00b584b3
OSDN Git Service
